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

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

Issue 6598002: Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years, 9 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/browser_signin.h" 24 #include "chrome/browser/browser_signin.h"
25 #include "chrome/browser/content_settings/host_content_settings_map.h" 25 #include "chrome/browser/content_settings/host_content_settings_map.h"
26 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 26 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
27 #include "chrome/browser/defaults.h" 27 #include "chrome/browser/defaults.h"
28 #include "chrome/browser/download/download_manager.h" 28 #include "chrome/browser/download/download_manager.h"
29 #include "chrome/browser/extensions/default_apps.h" 29 #include "chrome/browser/extensions/default_apps.h"
30 #include "chrome/browser/extensions/extension_devtools_manager.h" 30 #include "chrome/browser/extensions/extension_devtools_manager.h"
31 #include "chrome/browser/extensions/extension_error_reporter.h" 31 #include "chrome/browser/extensions/extension_error_reporter.h"
32 #include "chrome/browser/extensions/extension_event_router.h" 32 #include "chrome/browser/extensions/extension_event_router.h"
33 #include "chrome/browser/extensions/extension_info_map.h" 33 #include "chrome/browser/extensions/extension_info_map.h"
34 #include "chrome/browser/extensions/extension_io_event_router.h"
35 #include "chrome/browser/extensions/extension_message_service.h" 34 #include "chrome/browser/extensions/extension_message_service.h"
36 #include "chrome/browser/extensions/extension_pref_store.h" 35 #include "chrome/browser/extensions/extension_pref_store.h"
37 #include "chrome/browser/extensions/extension_process_manager.h" 36 #include "chrome/browser/extensions/extension_process_manager.h"
38 #include "chrome/browser/extensions/extension_service.h" 37 #include "chrome/browser/extensions/extension_service.h"
39 #include "chrome/browser/extensions/extension_special_storage_policy.h" 38 #include "chrome/browser/extensions/extension_special_storage_policy.h"
40 #include "chrome/browser/extensions/user_script_master.h" 39 #include "chrome/browser/extensions/user_script_master.h"
41 #include "chrome/browser/favicon_service.h" 40 #include "chrome/browser/favicon_service.h"
42 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 41 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
43 #include "chrome/browser/history/history.h" 42 #include "chrome/browser/history/history.h"
44 #include "chrome/browser/history/top_sites.h" 43 #include "chrome/browser/history/top_sites.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 // ChromeOS because Chrome is always running (no need for special keep-alive 304 // ChromeOS because Chrome is always running (no need for special keep-alive
306 // or launch-on-startup support). 305 // or launch-on-startup support).
307 #if !defined(OS_CHROMEOS) 306 #if !defined(OS_CHROMEOS)
308 background_mode_manager_.reset(new BackgroundModeManager(this, 307 background_mode_manager_.reset(new BackgroundModeManager(this,
309 CommandLine::ForCurrentProcess())); 308 CommandLine::ForCurrentProcess()));
310 #endif 309 #endif
311 310
312 background_contents_service_.reset( 311 background_contents_service_.reset(
313 new BackgroundContentsService(this, CommandLine::ForCurrentProcess())); 312 new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
314 313
315 extension_io_event_router_ = new ExtensionIOEventRouter(this);
316 extension_info_map_ = new ExtensionInfoMap(); 314 extension_info_map_ = new ExtensionInfoMap();
317 315
318 InitRegisteredProtocolHandlers(); 316 InitRegisteredProtocolHandlers();
319 317
320 clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit); 318 clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
321 319
322 // Log the profile size after a reasonable startup delay. 320 // Log the profile size after a reasonable startup delay.
323 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, 321 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
324 new ProfileSizeTask(path_), 112000); 322 new ProfileSizeTask(path_), 112000);
325 323
(...skipping 30 matching lines...) Expand all
356 return; // Already initialized. 354 return; // Already initialized.
357 355
358 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 356 const CommandLine* command_line = CommandLine::ForCurrentProcess();
359 if (command_line->HasSwitch( 357 if (command_line->HasSwitch(
360 switches::kEnableExtensionTimelineApi)) { 358 switches::kEnableExtensionTimelineApi)) {
361 extension_devtools_manager_ = new ExtensionDevToolsManager(this); 359 extension_devtools_manager_ = new ExtensionDevToolsManager(this);
362 } 360 }
363 361
364 extension_process_manager_.reset(ExtensionProcessManager::Create(this)); 362 extension_process_manager_.reset(ExtensionProcessManager::Create(this));
365 extension_event_router_.reset(new ExtensionEventRouter(this)); 363 extension_event_router_.reset(new ExtensionEventRouter(this));
366 extension_io_event_router_ = new ExtensionIOEventRouter(this);
367 extension_message_service_ = new ExtensionMessageService(this); 364 extension_message_service_ = new ExtensionMessageService(this);
368 365
369 ExtensionErrorReporter::Init(true); // allow noisy errors. 366 ExtensionErrorReporter::Init(true); // allow noisy errors.
370 367
371 FilePath script_dir; // Don't look for user scripts in any directory. 368 FilePath script_dir; // Don't look for user scripts in any directory.
372 // TODO(aa): We should just remove this functionality, 369 // TODO(aa): We should just remove this functionality,
373 // since it isn't used anymore. 370 // since it isn't used anymore.
374 user_script_master_ = new UserScriptMaster(script_dir, this); 371 user_script_master_ = new UserScriptMaster(script_dir, this);
375 372
376 extensions_service_ = new ExtensionService( 373 extensions_service_ = new ExtensionService(
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 // HistoryService will join with HistoryService's backend thread so that 575 // HistoryService will join with HistoryService's backend thread so that
579 // by the time the destructor has finished we're sure it will no longer call 576 // by the time the destructor has finished we're sure it will no longer call
580 // into the BookmarkModel. 577 // into the BookmarkModel.
581 history_service_ = NULL; 578 history_service_ = NULL;
582 bookmark_bar_model_.reset(); 579 bookmark_bar_model_.reset();
583 580
584 // FaviconService depends on HistoryServce so make sure we delete 581 // FaviconService depends on HistoryServce so make sure we delete
585 // HistoryService first. 582 // HistoryService first.
586 favicon_service_ = NULL; 583 favicon_service_ = NULL;
587 584
588 if (extension_io_event_router_)
589 extension_io_event_router_->DestroyingProfile();
590
591 if (extension_message_service_) 585 if (extension_message_service_)
592 extension_message_service_->DestroyingProfile(); 586 extension_message_service_->DestroyingProfile();
593 587
594 if (extensions_service_) 588 if (extensions_service_)
595 extensions_service_->DestroyingProfile(); 589 extensions_service_->DestroyingProfile();
596 590
597 if (pref_proxy_config_tracker_) 591 if (pref_proxy_config_tracker_)
598 pref_proxy_config_tracker_->DetachFromPrefService(); 592 pref_proxy_config_tracker_->DetachFromPrefService();
599 593
600 // This causes the Preferences file to be written to disk. 594 // This causes the Preferences file to be written to disk.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 } 695 }
702 696
703 ExtensionMessageService* ProfileImpl::GetExtensionMessageService() { 697 ExtensionMessageService* ProfileImpl::GetExtensionMessageService() {
704 return extension_message_service_.get(); 698 return extension_message_service_.get();
705 } 699 }
706 700
707 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { 701 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
708 return extension_event_router_.get(); 702 return extension_event_router_.get();
709 } 703 }
710 704
711 ExtensionIOEventRouter* ProfileImpl::GetExtensionIOEventRouter() {
712 return extension_io_event_router_.get();
713 }
714
715 ExtensionSpecialStoragePolicy* 705 ExtensionSpecialStoragePolicy*
716 ProfileImpl::GetExtensionSpecialStoragePolicy() { 706 ProfileImpl::GetExtensionSpecialStoragePolicy() {
717 if (!extension_special_storage_policy_.get()) 707 if (!extension_special_storage_policy_.get())
718 extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy(); 708 extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy();
719 return extension_special_storage_policy_.get(); 709 return extension_special_storage_policy_.get();
720 } 710 }
721 711
722 SSLHostState* ProfileImpl::GetSSLHostState() { 712 SSLHostState* ProfileImpl::GetSSLHostState() {
723 if (!ssl_host_state_.get()) 713 if (!ssl_host_state_.get())
724 ssl_host_state_.reset(new SSLHostState()); 714 ssl_host_state_.reset(new SSLHostState());
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 return pref_proxy_config_tracker_; 1518 return pref_proxy_config_tracker_;
1529 } 1519 }
1530 1520
1531 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1521 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1532 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1522 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1533 return NULL; 1523 return NULL;
1534 if (!prerender_manager_) 1524 if (!prerender_manager_)
1535 prerender_manager_ = new prerender::PrerenderManager(this); 1525 prerender_manager_ = new prerender::PrerenderManager(this);
1536 return prerender_manager_; 1526 return prerender_manager_;
1537 } 1527 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698