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_impl.cc

Issue 6598002: Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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/user_script_master.h" 38 #include "chrome/browser/extensions/user_script_master.h"
40 #include "chrome/browser/favicon_service.h" 39 #include "chrome/browser/favicon_service.h"
41 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 40 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
42 #include "chrome/browser/geolocation/geolocation_permission_context.h" 41 #include "chrome/browser/geolocation/geolocation_permission_context.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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 // ChromeOS because Chrome is always running (no need for special keep-alive 303 // ChromeOS because Chrome is always running (no need for special keep-alive
305 // or launch-on-startup support). 304 // or launch-on-startup support).
306 #if !defined(OS_CHROMEOS) 305 #if !defined(OS_CHROMEOS)
307 background_mode_manager_.reset(new BackgroundModeManager(this, 306 background_mode_manager_.reset(new BackgroundModeManager(this,
308 CommandLine::ForCurrentProcess())); 307 CommandLine::ForCurrentProcess()));
309 #endif 308 #endif
310 309
311 background_contents_service_.reset( 310 background_contents_service_.reset(
312 new BackgroundContentsService(this, CommandLine::ForCurrentProcess())); 311 new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
313 312
314 extension_io_event_router_ = new ExtensionIOEventRouter(this);
315 extension_info_map_ = new ExtensionInfoMap(); 313 extension_info_map_ = new ExtensionInfoMap();
316 314
317 InitRegisteredProtocolHandlers(); 315 InitRegisteredProtocolHandlers();
318 316
319 clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit); 317 clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
320 318
321 // Log the profile size after a reasonable startup delay. 319 // Log the profile size after a reasonable startup delay.
322 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE, 320 BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
323 new ProfileSizeTask(path_), 112000); 321 new ProfileSizeTask(path_), 112000);
324 322
(...skipping 30 matching lines...) Expand all
355 return; // Already initialized. 353 return; // Already initialized.
356 354
357 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 355 const CommandLine* command_line = CommandLine::ForCurrentProcess();
358 if (command_line->HasSwitch( 356 if (command_line->HasSwitch(
359 switches::kEnableExtensionTimelineApi)) { 357 switches::kEnableExtensionTimelineApi)) {
360 extension_devtools_manager_ = new ExtensionDevToolsManager(this); 358 extension_devtools_manager_ = new ExtensionDevToolsManager(this);
361 } 359 }
362 360
363 extension_process_manager_.reset(ExtensionProcessManager::Create(this)); 361 extension_process_manager_.reset(ExtensionProcessManager::Create(this));
364 extension_event_router_.reset(new ExtensionEventRouter(this)); 362 extension_event_router_.reset(new ExtensionEventRouter(this));
365 extension_io_event_router_ = new ExtensionIOEventRouter(this);
366 extension_message_service_ = new ExtensionMessageService(this); 363 extension_message_service_ = new ExtensionMessageService(this);
367 364
368 ExtensionErrorReporter::Init(true); // allow noisy errors. 365 ExtensionErrorReporter::Init(true); // allow noisy errors.
369 366
370 FilePath script_dir; // Don't look for user scripts in any directory. 367 FilePath script_dir; // Don't look for user scripts in any directory.
371 // TODO(aa): We should just remove this functionality, 368 // TODO(aa): We should just remove this functionality,
372 // since it isn't used anymore. 369 // since it isn't used anymore.
373 user_script_master_ = new UserScriptMaster(script_dir, this); 370 user_script_master_ = new UserScriptMaster(script_dir, this);
374 371
375 extensions_service_ = new ExtensionService( 372 extensions_service_ = new ExtensionService(
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 // HistoryService will join with HistoryService's backend thread so that 574 // HistoryService will join with HistoryService's backend thread so that
578 // by the time the destructor has finished we're sure it will no longer call 575 // by the time the destructor has finished we're sure it will no longer call
579 // into the BookmarkModel. 576 // into the BookmarkModel.
580 history_service_ = NULL; 577 history_service_ = NULL;
581 bookmark_bar_model_.reset(); 578 bookmark_bar_model_.reset();
582 579
583 // FaviconService depends on HistoryServce so make sure we delete 580 // FaviconService depends on HistoryServce so make sure we delete
584 // HistoryService first. 581 // HistoryService first.
585 favicon_service_ = NULL; 582 favicon_service_ = NULL;
586 583
587 if (extension_io_event_router_)
588 extension_io_event_router_->DestroyingProfile();
589
590 if (extension_message_service_) 584 if (extension_message_service_)
591 extension_message_service_->DestroyingProfile(); 585 extension_message_service_->DestroyingProfile();
592 586
593 if (extensions_service_) 587 if (extensions_service_)
594 extensions_service_->DestroyingProfile(); 588 extensions_service_->DestroyingProfile();
595 589
596 if (pref_proxy_config_tracker_) 590 if (pref_proxy_config_tracker_)
597 pref_proxy_config_tracker_->DetachFromPrefService(); 591 pref_proxy_config_tracker_->DetachFromPrefService();
598 592
599 // This causes the Preferences file to be written to disk. 593 // This causes the Preferences file to be written to disk.
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 } 692 }
699 693
700 ExtensionMessageService* ProfileImpl::GetExtensionMessageService() { 694 ExtensionMessageService* ProfileImpl::GetExtensionMessageService() {
701 return extension_message_service_.get(); 695 return extension_message_service_.get();
702 } 696 }
703 697
704 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() { 698 ExtensionEventRouter* ProfileImpl::GetExtensionEventRouter() {
705 return extension_event_router_.get(); 699 return extension_event_router_.get();
706 } 700 }
707 701
708 ExtensionIOEventRouter* ProfileImpl::GetExtensionIOEventRouter() {
709 return extension_io_event_router_.get();
710 }
711
712 SSLHostState* ProfileImpl::GetSSLHostState() { 702 SSLHostState* ProfileImpl::GetSSLHostState() {
713 if (!ssl_host_state_.get()) 703 if (!ssl_host_state_.get())
714 ssl_host_state_.reset(new SSLHostState()); 704 ssl_host_state_.reset(new SSLHostState());
715 705
716 DCHECK(ssl_host_state_->CalledOnValidThread()); 706 DCHECK(ssl_host_state_->CalledOnValidThread());
717 return ssl_host_state_.get(); 707 return ssl_host_state_.get();
718 } 708 }
719 709
720 net::TransportSecurityState* 710 net::TransportSecurityState*
721 ProfileImpl::GetTransportSecurityState() { 711 ProfileImpl::GetTransportSecurityState() {
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 return pref_proxy_config_tracker_; 1508 return pref_proxy_config_tracker_;
1519 } 1509 }
1520 1510
1521 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1511 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1522 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1512 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1523 return NULL; 1513 return NULL;
1524 if (!prerender_manager_) 1514 if (!prerender_manager_)
1525 prerender_manager_ = new prerender::PrerenderManager(this); 1515 prerender_manager_ = new prerender::PrerenderManager(this);
1526 return prerender_manager_; 1516 return prerender_manager_;
1527 } 1517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698