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

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

Issue 2168453002: [HBD] Don't advertise Flash if Content Setting is on CONTENT_SETTING_BLOCK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows compilation error Created 4 years, 5 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 PluginPrefs::GetForProfile(this).get(),
153 HostContentSettingsMapFactory::GetForProfile(this),
153 io_data_->GetResourceContextNoInit()); 154 io_data_->GetResourceContextNoInit());
154 #endif 155 #endif
155 156
156 #if defined(ENABLE_EXTENSIONS) 157 #if defined(ENABLE_EXTENSIONS)
157 // Make the chrome//extension-icon/ resource available. 158 // Make the chrome//extension-icon/ resource available.
158 extensions::ExtensionIconSource* icon_source = 159 extensions::ExtensionIconSource* icon_source =
159 new extensions::ExtensionIconSource(profile_); 160 new extensions::ExtensionIconSource(profile_);
160 content::URLDataSource::Add(this, icon_source); 161 content::URLDataSource::Add(this, icon_source);
161 162
162 BrowserThread::PostTask( 163 BrowserThread::PostTask(
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 549 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
549 #if defined(OS_CHROMEOS) 550 #if defined(OS_CHROMEOS)
550 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 551 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
551 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 552 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
552 g_browser_process->local_state()); 553 g_browser_process->local_state());
553 } 554 }
554 #endif // defined(OS_CHROMEOS) 555 #endif // defined(OS_CHROMEOS)
555 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 556 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
556 GetPrefs(), g_browser_process->local_state()); 557 GetPrefs(), g_browser_process->local_state());
557 } 558 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/print_preview_dialog_controller_browsertest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698