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

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

Issue 507503002: Remove BrowserThread dependency from usb_service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comments describing the new DeviceClient classes. Created 6 years, 3 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 <vector> 9 #include <vector>
10 10
11 #include "base/atomic_ref_count.h" 11 #include "base/atomic_ref_count.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/debug/alias.h" 15 #include "base/debug/alias.h"
16 #include "base/debug/leak_annotations.h" 16 #include "base/debug/leak_annotations.h"
17 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
18 #include "base/metrics/field_trial.h" 18 #include "base/metrics/field_trial.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/prefs/json_pref_store.h" 20 #include "base/prefs/json_pref_store.h"
21 #include "base/prefs/pref_registry_simple.h" 21 #include "base/prefs/pref_registry_simple.h"
22 #include "base/prefs/pref_service.h" 22 #include "base/prefs/pref_service.h"
23 #include "base/synchronization/waitable_event.h" 23 #include "base/synchronization/waitable_event.h"
24 #include "base/threading/thread.h" 24 #include "base/threading/thread.h"
25 #include "base/threading/thread_restrictions.h" 25 #include "base/threading/thread_restrictions.h"
26 #include "base/time/default_tick_clock.h" 26 #include "base/time/default_tick_clock.h"
27 #include "chrome/browser/background/background_mode_manager.h" 27 #include "chrome/browser/background/background_mode_manager.h"
28 #include "chrome/browser/chrome_browser_main.h" 28 #include "chrome/browser/chrome_browser_main.h"
29 #include "chrome/browser/chrome_content_browser_client.h" 29 #include "chrome/browser/chrome_content_browser_client.h"
30 #include "chrome/browser/chrome_device_client.h"
30 #include "chrome/browser/chrome_notification_types.h" 31 #include "chrome/browser/chrome_notification_types.h"
31 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h" 32 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h"
32 #include "chrome/browser/defaults.h" 33 #include "chrome/browser/defaults.h"
33 #include "chrome/browser/devtools/remote_debugging_server.h" 34 #include "chrome/browser/devtools/remote_debugging_server.h"
34 #include "chrome/browser/download/download_request_limiter.h" 35 #include "chrome/browser/download/download_request_limiter.h"
35 #include "chrome/browser/download/download_status_updater.h" 36 #include "chrome/browser/download/download_status_updater.h"
36 #include "chrome/browser/first_run/upgrade_util.h" 37 #include "chrome/browser/first_run/upgrade_util.h"
37 #include "chrome/browser/gpu/gl_string_manager.h" 38 #include "chrome/browser/gpu/gl_string_manager.h"
38 #include "chrome/browser/gpu/gpu_mode_manager.h" 39 #include "chrome/browser/gpu/gpu_mode_manager.h"
39 #include "chrome/browser/icon_manager.h" 40 #include "chrome/browser/icon_manager.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 extensions::kExtensionScheme); 188 extensions::kExtensionScheme);
188 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 189 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
189 extensions::kExtensionResourceScheme); 190 extensions::kExtensionResourceScheme);
190 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( 191 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
191 chrome::kChromeSearchScheme); 192 chrome::kChromeSearchScheme);
192 193
193 #if defined(OS_MACOSX) 194 #if defined(OS_MACOSX)
194 InitIdleMonitor(); 195 InitIdleMonitor();
195 #endif 196 #endif
196 197
198 device_client_.reset(new ChromeDeviceClient);
199
197 #if defined(ENABLE_EXTENSIONS) 200 #if defined(ENABLE_EXTENSIONS)
198 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); 201 apps::AppsClient::Set(ChromeAppsClient::GetInstance());
199 202
200 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; 203 extension_event_router_forwarder_ = new extensions::EventRouterForwarder;
201 ExtensionRendererState::GetInstance()->Init(); 204 ExtensionRendererState::GetInstance()->Init();
202 205
203 extensions::ExtensionsClient::Set( 206 extensions::ExtensionsClient::Set(
204 extensions::ChromeExtensionsClient::GetInstance()); 207 extensions::ChromeExtensionsClient::GetInstance());
205 208
206 extensions_browser_client_.reset( 209 extensions_browser_client_.reset(
(...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 } 1215 }
1213 1216
1214 void BrowserProcessImpl::OnAutoupdateTimer() { 1217 void BrowserProcessImpl::OnAutoupdateTimer() {
1215 if (CanAutorestartForUpdate()) { 1218 if (CanAutorestartForUpdate()) {
1216 DLOG(WARNING) << "Detected update. Restarting browser."; 1219 DLOG(WARNING) << "Detected update. Restarting browser.";
1217 RestartBackgroundInstance(); 1220 RestartBackgroundInstance();
1218 } 1221 }
1219 } 1222 }
1220 1223
1221 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1224 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698