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

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

Issue 1289423002: Add webusb notification UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added some #ifdef flags Created 5 years, 4 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
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #elif defined(OS_MACOSX) 104 #elif defined(OS_MACOSX)
105 #include "chrome/browser/chrome_browser_main_mac.h" 105 #include "chrome/browser/chrome_browser_main_mac.h"
106 #endif 106 #endif
107 107
108 #if !defined(OS_ANDROID) 108 #if !defined(OS_ANDROID)
109 #include "chrome/browser/chrome_device_client.h" 109 #include "chrome/browser/chrome_device_client.h"
110 #include "chrome/browser/services/gcm/gcm_desktop_utils.h" 110 #include "chrome/browser/services/gcm/gcm_desktop_utils.h"
111 #include "components/gcm_driver/gcm_client_factory.h" 111 #include "components/gcm_driver/gcm_client_factory.h"
112 #endif 112 #endif
113 113
114 #if !defined(OS_ANDROID) && !defined(OS_IOS)
115 #include "chrome/browser/chrome_webusb_browser_client.h"
116 #include "components/webusb/webusb_browser_client.h"
117 #include "components/webusb/webusb_detector.h"
118 #endif
119
114 #if defined(ENABLE_BACKGROUND) 120 #if defined(ENABLE_BACKGROUND)
115 #include "chrome/browser/background/background_mode_manager.h" 121 #include "chrome/browser/background/background_mode_manager.h"
116 #endif 122 #endif
117 123
118 #if defined(ENABLE_CONFIGURATION_POLICY) 124 #if defined(ENABLE_CONFIGURATION_POLICY)
119 #include "components/policy/core/browser/browser_policy_connector.h" 125 #include "components/policy/core/browser/browser_policy_connector.h"
120 #else 126 #else
121 #include "components/policy/core/common/policy_service_stub.h" 127 #include "components/policy/core/common/policy_service_stub.h"
122 #endif // defined(ENABLE_CONFIGURATION_POLICY) 128 #endif // defined(ENABLE_CONFIGURATION_POLICY)
123 129
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 224
219 extensions_browser_client_.reset( 225 extensions_browser_client_.reset(
220 new extensions::ChromeExtensionsBrowserClient); 226 new extensions::ChromeExtensionsBrowserClient);
221 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 227 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
222 #endif 228 #endif
223 229
224 message_center::MessageCenter::Initialize(); 230 message_center::MessageCenter::Initialize();
225 231
226 update_client::UpdateQueryParams::SetDelegate( 232 update_client::UpdateQueryParams::SetDelegate(
227 ChromeUpdateQueryParamsDelegate::GetInstance()); 233 ChromeUpdateQueryParamsDelegate::GetInstance());
234
235 #if !defined(OS_ANDROID) && !defined(OS_IOS)
236 webusb_browser_client_.reset(new ChromeWebUsbBrowserClient());
237 webusb::WebUsbBrowserClient::Set(webusb_browser_client_.get());
238 #endif
228 } 239 }
229 240
230 BrowserProcessImpl::~BrowserProcessImpl() { 241 BrowserProcessImpl::~BrowserProcessImpl() {
231 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); 242 tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
232 243
233 g_browser_process = NULL; 244 g_browser_process = NULL;
234 } 245 }
235 246
236 void BrowserProcessImpl::StartTearDown() { 247 void BrowserProcessImpl::StartTearDown() {
237 TRACE_EVENT0("shutdown", "BrowserProcessImpl::StartTearDown"); 248 TRACE_EVENT0("shutdown", "BrowserProcessImpl::StartTearDown");
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 } 1261 }
1251 1262
1252 void BrowserProcessImpl::OnAutoupdateTimer() { 1263 void BrowserProcessImpl::OnAutoupdateTimer() {
1253 if (CanAutorestartForUpdate()) { 1264 if (CanAutorestartForUpdate()) {
1254 DLOG(WARNING) << "Detected update. Restarting browser."; 1265 DLOG(WARNING) << "Detected update. Restarting browser.";
1255 RestartBackgroundInstance(); 1266 RestartBackgroundInstance();
1256 } 1267 }
1257 } 1268 }
1258 1269
1259 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1270 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698