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

Side by Side Diff: chrome/browser/profiles/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/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 131 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
132 #else 132 #else
133 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 133 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
134 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 134 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
135 #endif 135 #endif
136 #endif 136 #endif
137 137
138 #if defined(ENABLE_EXTENSIONS) 138 #if defined(ENABLE_EXTENSIONS)
139 #include "chrome/browser/extensions/extension_service.h" 139 #include "chrome/browser/extensions/extension_service.h"
140 #include "chrome/browser/extensions/extension_special_storage_policy.h" 140 #include "chrome/browser/extensions/extension_special_storage_policy.h"
141 #include "chrome/browser/guest_view/guest_view_manager.h"
142 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 141 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
143 #include "extensions/browser/extension_pref_store.h" 142 #include "extensions/browser/extension_pref_store.h"
144 #include "extensions/browser/extension_pref_value_map.h" 143 #include "extensions/browser/extension_pref_value_map.h"
145 #include "extensions/browser/extension_pref_value_map_factory.h" 144 #include "extensions/browser/extension_pref_value_map_factory.h"
146 #include "extensions/browser/extension_system.h" 145 #include "extensions/browser/extension_system.h"
146 #include "extensions/browser/guest_view/guest_view_manager.h"
147 #endif 147 #endif
148 148
149 #if defined(ENABLE_MANAGED_USERS) 149 #if defined(ENABLE_MANAGED_USERS)
150 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 150 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
151 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 151 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
152 #endif 152 #endif
153 153
154 using base::Time; 154 using base::Time;
155 using base::TimeDelta; 155 using base::TimeDelta;
156 using base::UserMetricsAction; 156 using base::UserMetricsAction;
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
1082 1082
1083 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 1083 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
1084 if (!host_content_settings_map_.get()) { 1084 if (!host_content_settings_map_.get()) {
1085 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); 1085 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
1086 } 1086 }
1087 return host_content_settings_map_.get(); 1087 return host_content_settings_map_.get();
1088 } 1088 }
1089 1089
1090 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1090 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1091 #if defined(ENABLE_EXTENSIONS) 1091 #if defined(ENABLE_EXTENSIONS)
1092 return GuestViewManager::FromBrowserContext(this); 1092 return extensions::GuestViewManager::FromBrowserContext(this);
1093 #else 1093 #else
1094 return NULL; 1094 return NULL;
1095 #endif 1095 #endif
1096 } 1096 }
1097 1097
1098 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { 1098 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
1099 return DownloadServiceFactory::GetForBrowserContext(this)-> 1099 return DownloadServiceFactory::GetForBrowserContext(this)->
1100 GetDownloadManagerDelegate(); 1100 GetDownloadManagerDelegate();
1101 } 1101 }
1102 1102
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 ProfileImpl::CreateDomainReliabilityMonitor() { 1401 ProfileImpl::CreateDomainReliabilityMonitor() {
1402 domain_reliability::DomainReliabilityService* service = 1402 domain_reliability::DomainReliabilityService* service =
1403 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1403 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1404 GetForBrowserContext(this); 1404 GetForBrowserContext(this);
1405 if (!service) 1405 if (!service)
1406 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1406 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1407 1407
1408 return service->CreateMonitor( 1408 return service->CreateMonitor(
1409 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1409 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1410 } 1410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698