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

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: Test change to build Created 5 years, 7 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 host_content_settings_map_->RegisterProvider( 1007 host_content_settings_map_->RegisterProvider(
1008 HostContentSettingsMap::SUPERVISED_PROVIDER, 1008 HostContentSettingsMap::SUPERVISED_PROVIDER,
1009 supervised_provider.Pass()); 1009 supervised_provider.Pass());
1010 #endif 1010 #endif
1011 } 1011 }
1012 return host_content_settings_map_.get(); 1012 return host_content_settings_map_.get();
1013 } 1013 }
1014 1014
1015 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1015 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1016 #if defined(ENABLE_EXTENSIONS) 1016 #if defined(ENABLE_EXTENSIONS)
1017 return extensions::GuestViewManager::FromBrowserContext(this); 1017 return guestview::GuestViewManager::FromBrowserContext(this);
1018 #else 1018 #else
1019 return NULL; 1019 return NULL;
1020 #endif 1020 #endif
1021 } 1021 }
1022 1022
1023 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { 1023 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
1024 return DownloadServiceFactory::GetForBrowserContext(this)-> 1024 return DownloadServiceFactory::GetForBrowserContext(this)->
1025 GetDownloadManagerDelegate(); 1025 GetDownloadManagerDelegate();
1026 } 1026 }
1027 1027
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1296 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1297 domain_reliability::DomainReliabilityService* service = 1297 domain_reliability::DomainReliabilityService* service =
1298 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1298 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1299 GetForBrowserContext(this); 1299 GetForBrowserContext(this);
1300 if (!service) 1300 if (!service)
1301 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1301 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1302 1302
1303 return service->CreateMonitor( 1303 return service->CreateMonitor(
1304 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1304 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1305 } 1305 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698