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

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

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed tests I hope Created 5 years, 8 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 host_content_settings_map_->RegisterProvider( 408 host_content_settings_map_->RegisterProvider(
409 HostContentSettingsMap::SUPERVISED_PROVIDER, 409 HostContentSettingsMap::SUPERVISED_PROVIDER,
410 supervised_provider.Pass()); 410 supervised_provider.Pass());
411 #endif 411 #endif
412 } 412 }
413 return host_content_settings_map_.get(); 413 return host_content_settings_map_.get();
414 } 414 }
415 415
416 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { 416 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {
417 #if defined(ENABLE_EXTENSIONS) 417 #if defined(ENABLE_EXTENSIONS)
418 return extensions::GuestViewManager::FromBrowserContextIfAvailable(this); 418 return extensions::GuestViewManager::FromBrowserContext(this);
419 #else 419 #else
420 return NULL; 420 return NULL;
421 #endif 421 #endif
422 } 422 }
423 423
424 storage::SpecialStoragePolicy* 424 storage::SpecialStoragePolicy*
425 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { 425 OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
426 #if defined(ENABLE_EXTENSIONS) 426 #if defined(ENABLE_EXTENSIONS)
427 return GetExtensionSpecialStoragePolicy(); 427 return GetExtensionSpecialStoragePolicy();
428 #else 428 #else
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 592 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
593 #if defined(OS_CHROMEOS) 593 #if defined(OS_CHROMEOS)
594 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 594 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
595 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 595 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
596 g_browser_process->local_state()); 596 g_browser_process->local_state());
597 } 597 }
598 #endif // defined(OS_CHROMEOS) 598 #endif // defined(OS_CHROMEOS)
599 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 599 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
600 GetPrefs(), g_browser_process->local_state()); 600 GetPrefs(), g_browser_process->local_state());
601 } 601 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698