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

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

Issue 56253002: Move ExtensionsProcessManager to src/extensions, part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 1 month 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/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 <vector> 9 #include <vector>
10 10
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 181 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
182 chrome::kChromeSearchScheme); 182 chrome::kChromeSearchScheme);
183 183
184 #if defined(OS_MACOSX) 184 #if defined(OS_MACOSX)
185 InitIdleMonitor(); 185 InitIdleMonitor();
186 #endif 186 #endif
187 187
188 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); 188 apps::AppsClient::Set(ChromeAppsClient::GetInstance());
189 extensions::ExtensionsClient::Set( 189 extensions::ExtensionsClient::Set(
190 extensions::ChromeExtensionsClient::GetInstance()); 190 extensions::ChromeExtensionsClient::GetInstance());
191 extensions::ExtensionsBrowserClient::Set( 191
192 extensions::ChromeExtensionsBrowserClient::GetInstance()); 192 extensions_browser_client_.reset(
193 new extensions::ChromeExtensionsBrowserClient);
194 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
195
193 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; 196 extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
194 ExtensionRendererState::GetInstance()->Init(); 197 ExtensionRendererState::GetInstance()->Init();
195 198
196 message_center::MessageCenter::Initialize(); 199 message_center::MessageCenter::Initialize();
197 } 200 }
198 201
199 BrowserProcessImpl::~BrowserProcessImpl() { 202 BrowserProcessImpl::~BrowserProcessImpl() {
200 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); 203 tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
201 204
202 g_browser_process = NULL; 205 g_browser_process = NULL;
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 } 1076 }
1074 1077
1075 void BrowserProcessImpl::OnAutoupdateTimer() { 1078 void BrowserProcessImpl::OnAutoupdateTimer() {
1076 if (CanAutorestartForUpdate()) { 1079 if (CanAutorestartForUpdate()) {
1077 DLOG(WARNING) << "Detected update. Restarting browser."; 1080 DLOG(WARNING) << "Detected update. Restarting browser.";
1078 RestartBackgroundInstance(); 1081 RestartBackgroundInstance();
1079 } 1082 }
1080 } 1083 }
1081 1084
1082 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1085 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698