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

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

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Mac Build + GN Test builds 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/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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 #else 130 #else
131 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 131 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
132 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 132 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
133 #endif 133 #endif
134 #endif 134 #endif
135 135
136 #if defined(ENABLE_EXTENSIONS) 136 #if defined(ENABLE_EXTENSIONS)
137 #include "chrome/browser/extensions/extension_service.h" 137 #include "chrome/browser/extensions/extension_service.h"
138 #include "chrome/browser/extensions/extension_special_storage_policy.h" 138 #include "chrome/browser/extensions/extension_special_storage_policy.h"
139 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 139 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
140 #include "components/guest_view/browser/guest_view_manager.h"
140 #include "extensions/browser/extension_pref_store.h" 141 #include "extensions/browser/extension_pref_store.h"
141 #include "extensions/browser/extension_pref_value_map.h" 142 #include "extensions/browser/extension_pref_value_map.h"
142 #include "extensions/browser/extension_pref_value_map_factory.h" 143 #include "extensions/browser/extension_pref_value_map_factory.h"
143 #include "extensions/browser/extension_system.h" 144 #include "extensions/browser/extension_system.h"
144 #include "extensions/browser/guest_view/guest_view_manager.h"
145 #endif 145 #endif
146 146
147 #if defined(ENABLE_SUPERVISED_USERS) 147 #if defined(ENABLE_SUPERVISED_USERS)
148 #include "chrome/browser/content_settings/content_settings_supervised_provider.h " 148 #include "chrome/browser/content_settings/content_settings_supervised_provider.h "
149 #include "chrome/browser/supervised_user/supervised_user_constants.h" 149 #include "chrome/browser/supervised_user/supervised_user_constants.h"
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;
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 host_content_settings_map_->RegisterProvider( 1046 host_content_settings_map_->RegisterProvider(
1047 HostContentSettingsMap::SUPERVISED_PROVIDER, 1047 HostContentSettingsMap::SUPERVISED_PROVIDER,
1048 supervised_provider.Pass()); 1048 supervised_provider.Pass());
1049 #endif 1049 #endif
1050 } 1050 }
1051 return host_content_settings_map_.get(); 1051 return host_content_settings_map_.get();
1052 } 1052 }
1053 1053
1054 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1054 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1055 #if defined(ENABLE_EXTENSIONS) 1055 #if defined(ENABLE_EXTENSIONS)
1056 return extensions::GuestViewManager::FromBrowserContext(this); 1056 return guestview::GuestViewManager::FromBrowserContext(this);
1057 #else 1057 #else
1058 return NULL; 1058 return NULL;
1059 #endif 1059 #endif
1060 } 1060 }
1061 1061
1062 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { 1062 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
1063 return DownloadServiceFactory::GetForBrowserContext(this)-> 1063 return DownloadServiceFactory::GetForBrowserContext(this)->
1064 GetDownloadManagerDelegate(); 1064 GetDownloadManagerDelegate();
1065 } 1065 }
1066 1066
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1335 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1336 domain_reliability::DomainReliabilityService* service = 1336 domain_reliability::DomainReliabilityService* service =
1337 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1337 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1338 GetForBrowserContext(this); 1338 GetForBrowserContext(this);
1339 if (!service) 1339 if (!service)
1340 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1340 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1341 1341
1342 return service->CreateMonitor( 1342 return service->CreateMonitor(
1343 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1343 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1344 } 1344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698