← Back to branch summary

~osomon/oxide/ensure-files-exist

« back to all changes in this revision

Viewing changes to shared/browser/oxide_user_agent_override_provider.cc

  • Committer: Olivier Tilloy
  • Date: 2014-09-25 16:27:09 UTC
  • mfrom: (677.1.95 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20140925162709-h8bai0f1nfaf7cfy
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_user_agent_override_provider.cc
40
40
void UserAgentOverrideProvider::OnGetUserAgentOverride(const GURL& url,
41
41
                                                       std::string* user_agent,
42
42
                                                       bool* overridden) {
43
 
  scoped_refptr<BrowserContextDelegate> delegate(context_->GetDelegate());
44
 
  if (!delegate) {
 
43
  scoped_refptr<BrowserContextDelegate> delegate(
 
44
      BrowserContextIOData::FromResourceContext(context_)->GetDelegate());
 
45
  if (!delegate.get()) {
45
46
    *overridden = false;
46
47
    return;
47
48
  }
52
53
UserAgentOverrideProvider::UserAgentOverrideProvider(
53
54
    content::RenderProcessHost* render_process_host) :
54
55
    content::BrowserMessageFilter(OxideMsgStart),
55
 
    context_(BrowserContext::FromContent(
56
 
      render_process_host->GetBrowserContext())->io_data()) {}
 
56
    context_(render_process_host->GetBrowserContext()->GetResourceContext()) {}
57
57
 
58
58
UserAgentOverrideProvider::~UserAgentOverrideProvider() {}
59
59