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

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

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no crashy Created 8 years, 10 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 | Annotate | Revision Log
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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/content_settings/cookie_settings.h" 19 #include "chrome/browser/content_settings/cookie_settings.h"
20 #include "chrome/browser/content_settings/host_content_settings_map.h" 20 #include "chrome/browser/content_settings/host_content_settings_map.h"
21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
22 #include "chrome/browser/download/download_service.h" 22 #include "chrome/browser/download/download_service.h"
23 #include "chrome/browser/download/download_service_factory.h" 23 #include "chrome/browser/download/download_service_factory.h"
24 #include "chrome/browser/extensions/extension_info_map.h" 24 #include "chrome/browser/extensions/extension_info_map.h"
25 #include "chrome/browser/extensions/extension_protocols.h" 25 #include "chrome/browser/extensions/extension_protocols.h"
26 #include "chrome/browser/extensions/extension_system.h"
27 #include "chrome/browser/extensions/extension_system_factory.h"
26 #include "chrome/browser/io_thread.h" 28 #include "chrome/browser/io_thread.h"
27 #include "chrome/browser/media/media_internals.h" 29 #include "chrome/browser/media/media_internals.h"
28 #include "chrome/browser/net/chrome_cookie_notification_details.h" 30 #include "chrome/browser/net/chrome_cookie_notification_details.h"
29 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" 31 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
30 #include "chrome/browser/net/chrome_net_log.h" 32 #include "chrome/browser/net/chrome_net_log.h"
31 #include "chrome/browser/net/chrome_network_delegate.h" 33 #include "chrome/browser/net/chrome_network_delegate.h"
32 #include "chrome/browser/net/proxy_service_factory.h" 34 #include "chrome/browser/net/proxy_service_factory.h"
33 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 35 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
34 #include "chrome/browser/policy/url_blacklist_manager.h" 36 #include "chrome/browser/policy/url_blacklist_manager.h"
35 #include "chrome/browser/prefs/pref_service.h" 37 #include "chrome/browser/prefs/pref_service.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 222
221 params->host_content_settings_map = profile->GetHostContentSettingsMap(); 223 params->host_content_settings_map = profile->GetHostContentSettingsMap();
222 params->cookie_settings = CookieSettings::Factory::GetForProfile(profile); 224 params->cookie_settings = CookieSettings::Factory::GetForProfile(profile);
223 params->host_zoom_map = profile->GetHostZoomMap(); 225 params->host_zoom_map = profile->GetHostZoomMap();
224 params->ssl_config_service = profile->GetSSLConfigService(); 226 params->ssl_config_service = profile->GetSSLConfigService();
225 base::Callback<Profile*(void)> profile_getter = 227 base::Callback<Profile*(void)> profile_getter =
226 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), 228 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(),
227 profile); 229 profile);
228 params->cookie_monster_delegate = 230 params->cookie_monster_delegate =
229 new ChromeCookieMonsterDelegate(profile_getter); 231 new ChromeCookieMonsterDelegate(profile_getter);
230 params->extension_info_map = profile->GetExtensionInfoMap(); 232 params->extension_info_map =
233 ExtensionSystemFactory::GetForProfile(profile)->info_map();
231 params->notification_service = 234 params->notification_service =
232 DesktopNotificationServiceFactory::GetForProfile(profile); 235 DesktopNotificationServiceFactory::GetForProfile(profile);
233 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); 236 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
234 237
235 ChromeProxyConfigService* proxy_config_service = 238 ChromeProxyConfigService* proxy_config_service =
236 ProxyServiceFactory::CreateProxyConfigService(true); 239 ProxyServiceFactory::CreateProxyConfigService(true);
237 params->proxy_config_service.reset(proxy_config_service); 240 params->proxy_config_service.reset(proxy_config_service);
238 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( 241 profile->GetProxyConfigTracker()->SetChromeProxyConfigService(
239 proxy_config_service); 242 proxy_config_service);
240 params->profile = profile; 243 params->profile = profile;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 &resource_context_)); 582 &resource_context_));
580 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); 583 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
581 if (!posted) 584 if (!posted)
582 delete this; 585 delete this;
583 } 586 }
584 587
585 void ProfileIOData::set_origin_bound_cert_service( 588 void ProfileIOData::set_origin_bound_cert_service(
586 net::OriginBoundCertService* origin_bound_cert_service) const { 589 net::OriginBoundCertService* origin_bound_cert_service) const {
587 origin_bound_cert_service_.reset(origin_bound_cert_service); 590 origin_bound_cert_service_.reset(origin_bound_cert_service);
588 } 591 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698