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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed bug + latest master Created 8 years, 5 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/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/background/background_mode_manager.h" 22 #include "chrome/browser/background/background_mode_manager.h"
23 #include "chrome/browser/browser_trial.h" 23 #include "chrome/browser/browser_trial.h"
24 #include "chrome/browser/chrome_browser_main.h" 24 #include "chrome/browser/chrome_browser_main.h"
25 #include "chrome/browser/chrome_content_browser_client.h" 25 #include "chrome/browser/chrome_content_browser_client.h"
26 #include "chrome/browser/chrome_plugin_service_filter.h" 26 #include "chrome/browser/chrome_plugin_service_filter.h"
27 #include "chrome/browser/component_updater/component_updater_configurator.h" 27 #include "chrome/browser/component_updater/component_updater_configurator.h"
28 #include "chrome/browser/component_updater/component_updater_service.h" 28 #include "chrome/browser/component_updater/component_updater_service.h"
29 #include "chrome/browser/debugger/remote_debugging_server.h" 29 #include "chrome/browser/debugger/remote_debugging_server.h"
30 #include "chrome/browser/download/download_request_limiter.h" 30 #include "chrome/browser/download/download_request_limiter.h"
31 #include "chrome/browser/download/download_status_updater.h" 31 #include "chrome/browser/download/download_status_updater.h"
32 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 32 #include "chrome/browser/extensions/event_router_forwarder.h"
33 #include "chrome/browser/extensions/extension_tab_id_map.h" 33 #include "chrome/browser/extensions/extension_tab_id_map.h"
34 #include "chrome/browser/first_run/upgrade_util.h" 34 #include "chrome/browser/first_run/upgrade_util.h"
35 #include "chrome/browser/icon_manager.h" 35 #include "chrome/browser/icon_manager.h"
36 #include "chrome/browser/intranet_redirect_detector.h" 36 #include "chrome/browser/intranet_redirect_detector.h"
37 #include "chrome/browser/io_thread.h" 37 #include "chrome/browser/io_thread.h"
38 #include "chrome/browser/lifetime/application_lifetime.h" 38 #include "chrome/browser/lifetime/application_lifetime.h"
39 #include "chrome/browser/metrics/metrics_service.h" 39 #include "chrome/browser/metrics/metrics_service.h"
40 #include "chrome/browser/metrics/thread_watcher.h" 40 #include "chrome/browser/metrics/thread_watcher.h"
41 #include "chrome/browser/metrics/variations_service.h" 41 #include "chrome/browser/metrics/variations_service.h"
42 #include "chrome/browser/net/chrome_net_log.h" 42 #include "chrome/browser/net/chrome_net_log.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 print_job_manager_.reset(new printing::PrintJobManager); 149 print_job_manager_.reset(new printing::PrintJobManager);
150 #endif 150 #endif
151 151
152 net_log_.reset(new ChromeNetLog); 152 net_log_.reset(new ChromeNetLog);
153 153
154 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 154 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
155 chrome::kExtensionScheme); 155 chrome::kExtensionScheme);
156 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 156 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
157 chrome::kExtensionResourceScheme); 157 chrome::kExtensionResourceScheme);
158 158
159 extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; 159 extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
160 160
161 ExtensionTabIdMap::GetInstance()->Init(); 161 ExtensionTabIdMap::GetInstance()->Init();
162 } 162 }
163 163
164 BrowserProcessImpl::~BrowserProcessImpl() { 164 BrowserProcessImpl::~BrowserProcessImpl() {
165 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); 165 tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
166 166
167 g_browser_process = NULL; 167 g_browser_process = NULL;
168 } 168 }
169 169
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 405
406 #if defined(OS_CHROMEOS) 406 #if defined(OS_CHROMEOS)
407 chromeos::OomPriorityManager* BrowserProcessImpl::oom_priority_manager() { 407 chromeos::OomPriorityManager* BrowserProcessImpl::oom_priority_manager() {
408 DCHECK(CalledOnValidThread()); 408 DCHECK(CalledOnValidThread());
409 if (!oom_priority_manager_.get()) 409 if (!oom_priority_manager_.get())
410 oom_priority_manager_.reset(new chromeos::OomPriorityManager()); 410 oom_priority_manager_.reset(new chromeos::OomPriorityManager());
411 return oom_priority_manager_.get(); 411 return oom_priority_manager_.get();
412 } 412 }
413 #endif // defined(OS_CHROMEOS) 413 #endif // defined(OS_CHROMEOS)
414 414
415 ExtensionEventRouterForwarder* 415 extensions::EventRouterForwarder*
416 BrowserProcessImpl::extension_event_router_forwarder() { 416 BrowserProcessImpl::extension_event_router_forwarder() {
417 return extension_event_router_forwarder_.get(); 417 return extension_event_router_forwarder_.get();
418 } 418 }
419 419
420 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() { 420 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
421 DCHECK(CalledOnValidThread()); 421 DCHECK(CalledOnValidThread());
422 if (!created_notification_ui_manager_) 422 if (!created_notification_ui_manager_)
423 CreateNotificationUIManager(); 423 CreateNotificationUIManager();
424 return notification_ui_manager_.get(); 424 return notification_ui_manager_.get();
425 } 425 }
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 } 924 }
925 925
926 void BrowserProcessImpl::OnAutoupdateTimer() { 926 void BrowserProcessImpl::OnAutoupdateTimer() {
927 if (CanAutorestartForUpdate()) { 927 if (CanAutorestartForUpdate()) {
928 DLOG(WARNING) << "Detected update. Restarting browser."; 928 DLOG(WARNING) << "Detected update. Restarting browser.";
929 RestartBackgroundInstance(); 929 RestartBackgroundInstance();
930 } 930 }
931 } 931 }
932 932
933 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 933 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chromeos/extensions/bluetooth_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698