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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 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 "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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/browser/chromeos/preferences.h" 64 #include "chrome/browser/chromeos/preferences.h"
65 #include "chrome/browser/chromeos/profiles/profile_helper.h" 65 #include "chrome/browser/chromeos/profiles/profile_helper.h"
66 #endif 66 #endif
67 67
68 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 68 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
69 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 69 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
70 #endif 70 #endif
71 71
72 #if defined(ENABLE_EXTENSIONS) 72 #if defined(ENABLE_EXTENSIONS)
73 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 73 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
74 #include "chrome/browser/guest_view/guest_view_manager.h"
75 #include "extensions/browser/extension_system.h" 74 #include "extensions/browser/extension_system.h"
75 #include "extensions/browser/guest_view/guest_view_manager.h"
76 #include "extensions/common/extension.h" 76 #include "extensions/common/extension.h"
77 #endif 77 #endif
78 78
79 using content::BrowserThread; 79 using content::BrowserThread;
80 using content::DownloadManagerDelegate; 80 using content::DownloadManagerDelegate;
81 using content::HostZoomMap; 81 using content::HostZoomMap;
82 82
83 #if defined(ENABLE_EXTENSIONS) 83 #if defined(ENABLE_EXTENSIONS)
84 namespace { 84 namespace {
85 85
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 extensions::ExtensionSystem::Get(this)->extension_service(); 357 extensions::ExtensionSystem::Get(this)->extension_service();
358 if (extension_service) 358 if (extension_service)
359 host_content_settings_map_->RegisterExtensionService(extension_service); 359 host_content_settings_map_->RegisterExtensionService(extension_service);
360 #endif 360 #endif
361 } 361 }
362 return host_content_settings_map_.get(); 362 return host_content_settings_map_.get();
363 } 363 }
364 364
365 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { 365 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {
366 #if defined(ENABLE_EXTENSIONS) 366 #if defined(ENABLE_EXTENSIONS)
367 return GuestViewManager::FromBrowserContext(this); 367 return extensions::GuestViewManager::FromBrowserContext(this);
368 #else 368 #else
369 return NULL; 369 return NULL;
370 #endif 370 #endif
371 } 371 }
372 372
373 quota::SpecialStoragePolicy* 373 quota::SpecialStoragePolicy*
374 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { 374 OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
375 return GetExtensionSpecialStoragePolicy(); 375 return GetExtensionSpecialStoragePolicy();
376 } 376 }
377 377
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 531 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
532 #if defined(OS_CHROMEOS) 532 #if defined(OS_CHROMEOS)
533 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 533 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
534 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 534 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
535 g_browser_process->local_state()); 535 g_browser_process->local_state());
536 } 536 }
537 #endif // defined(OS_CHROMEOS) 537 #endif // defined(OS_CHROMEOS)
538 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 538 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
539 GetPrefs(), g_browser_process->local_state()); 539 GetPrefs(), g_browser_process->local_state());
540 } 540 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_link_manager.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698