Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 2234133003: [HBD] Call PurgePluginListCache() whenever plugin content settings change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hbd_exceptions
Patch Set: Rebase and tracked patchset change Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // Guest profiles may always be OTR. Check IncognitoModePrefs otherwise. 143 // Guest profiles may always be OTR. Check IncognitoModePrefs otherwise.
144 DCHECK(profile_->IsGuestSession() || 144 DCHECK(profile_->IsGuestSession() ||
145 IncognitoModePrefs::GetAvailability(profile_->GetPrefs()) != 145 IncognitoModePrefs::GetAvailability(profile_->GetPrefs()) !=
146 IncognitoModePrefs::DISABLED); 146 IncognitoModePrefs::DISABLED);
147 147
148 TrackZoomLevelsFromParent(); 148 TrackZoomLevelsFromParent();
149 149
150 #if defined(ENABLE_PLUGINS) 150 #if defined(ENABLE_PLUGINS)
151 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( 151 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
152 PluginPrefs::GetForProfile(this).get(), 152 this, io_data_->GetResourceContextNoInit());
153 HostContentSettingsMapFactory::GetForProfile(this),
154 io_data_->GetResourceContextNoInit());
155 #endif 153 #endif
156 154
157 #if defined(ENABLE_EXTENSIONS) 155 #if defined(ENABLE_EXTENSIONS)
158 // Make the chrome//extension-icon/ resource available. 156 // Make the chrome//extension-icon/ resource available.
159 extensions::ExtensionIconSource* icon_source = 157 extensions::ExtensionIconSource* icon_source =
160 new extensions::ExtensionIconSource(profile_); 158 new extensions::ExtensionIconSource(profile_);
161 content::URLDataSource::Add(this, icon_source); 159 content::URLDataSource::Add(this, icon_source);
162 160
163 BrowserThread::PostTask( 161 BrowserThread::PostTask(
164 BrowserThread::IO, FROM_HERE, 162 BrowserThread::IO, FROM_HERE,
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 551 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
554 #if defined(OS_CHROMEOS) 552 #if defined(OS_CHROMEOS)
555 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 553 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
556 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 554 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
557 g_browser_process->local_state()); 555 g_browser_process->local_state());
558 } 556 }
559 #endif // defined(OS_CHROMEOS) 557 #endif // defined(OS_CHROMEOS)
560 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 558 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
561 GetPrefs(), g_browser_process->local_state()); 559 GetPrefs(), g_browser_process->local_state());
562 } 560 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/chrome_plugin_service_filter.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698