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

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

Issue 6598002: Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/browser_thread.h" 12 #include "chrome/browser/browser_thread.h"
13 #include "chrome/browser/extensions/extension_io_event_router.h"
14 #include "chrome/browser/io_thread.h" 13 #include "chrome/browser/io_thread.h"
15 #include "chrome/browser/net/chrome_cookie_notification_details.h" 14 #include "chrome/browser/net/chrome_cookie_notification_details.h"
16 #include "chrome/browser/net/pref_proxy_config_service.h" 15 #include "chrome/browser/net/pref_proxy_config_service.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
19 #include "chrome/browser/extensions/user_script_master.h" 18 #include "chrome/browser/extensions/user_script_master.h"
20 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/notification_service.h" 20 #include "chrome/common/notification_service.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "net/http/http_util.h" 22 #include "net/http/http_util.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 profile->GetUserScriptMaster()->user_script_dir(); 160 profile->GetUserScriptMaster()->user_script_dir();
162 } 161 }
163 162
164 params->ssl_config_service = profile->GetSSLConfigService(); 163 params->ssl_config_service = profile->GetSSLConfigService();
165 params->cookie_monster_delegate = new ChromeCookieMonsterDelegate(profile); 164 params->cookie_monster_delegate = new ChromeCookieMonsterDelegate(profile);
166 params->database_tracker = profile->GetDatabaseTracker(); 165 params->database_tracker = profile->GetDatabaseTracker();
167 params->appcache_service = profile->GetAppCacheService(); 166 params->appcache_service = profile->GetAppCacheService();
168 params->blob_storage_context = profile->GetBlobStorageContext(); 167 params->blob_storage_context = profile->GetBlobStorageContext();
169 params->file_system_context = profile->GetFileSystemContext(); 168 params->file_system_context = profile->GetFileSystemContext();
170 params->extension_info_map = profile->GetExtensionInfoMap(); 169 params->extension_info_map = profile->GetExtensionInfoMap();
171 params->extension_io_event_router = profile->GetExtensionIOEventRouter();
172 params->prerender_manager = profile->GetPrerenderManager(); 170 params->prerender_manager = profile->GetPrerenderManager();
173 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); 171 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
174 172
175 params->proxy_config_service.reset(CreateProxyConfigService(profile)); 173 params->proxy_config_service.reset(CreateProxyConfigService(profile));
174 params->profile = profile;
176 } 175 }
177 176
178 ProfileIOData::RequestContext::RequestContext() {} 177 ProfileIOData::RequestContext::RequestContext() {}
179 ProfileIOData::RequestContext::~RequestContext() {} 178 ProfileIOData::RequestContext::~RequestContext() {}
180 179
181 ProfileIOData::ProfileParams::ProfileParams() 180 ProfileIOData::ProfileParams::ProfileParams()
182 : is_off_the_record(false), 181 : is_off_the_record(false),
183 clear_local_state_on_exit(false) {} 182 clear_local_state_on_exit(false) {}
184 ProfileIOData::ProfileParams::~ProfileParams() {} 183 ProfileIOData::ProfileParams::~ProfileParams() {}
185 184
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 335
337 #if defined(OS_CHROMEOS) 336 #if defined(OS_CHROMEOS)
338 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { 337 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
339 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> 338 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->
340 RegisterNetworkProxyHandler(proxy_service); 339 RegisterNetworkProxyHandler(proxy_service);
341 } 340 }
342 #endif // defined(OS_CHROMEOS) 341 #endif // defined(OS_CHROMEOS)
343 342
344 return proxy_service; 343 return proxy_service;
345 } 344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698