OLD | NEW |
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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 // Debugger must be cleaned up before ProfileManager. | 273 // Debugger must be cleaned up before ProfileManager. |
274 remote_debugging_server_.reset(); | 274 remote_debugging_server_.reset(); |
275 #endif | 275 #endif |
276 | 276 |
277 // Need to clear profiles (download managers) before the io_thread_. | 277 // Need to clear profiles (download managers) before the io_thread_. |
278 { | 278 { |
279 TRACE_EVENT0("shutdown", | 279 TRACE_EVENT0("shutdown", |
280 "BrowserProcessImpl::StartTearDown:ProfileManager"); | 280 "BrowserProcessImpl::StartTearDown:ProfileManager"); |
281 // The desktop User Manager needs to be closed before the guest profile | 281 // The desktop User Manager needs to be closed before the guest profile |
282 // can be destroyed. | 282 // can be destroyed. |
283 if (switches::IsNewAvatarMenu()) | 283 UserManager::Hide(); |
284 UserManager::Hide(); | |
285 profile_manager_.reset(); | 284 profile_manager_.reset(); |
286 } | 285 } |
287 | 286 |
288 // PromoResourceService must be destroyed after the keyed services and before | 287 // PromoResourceService must be destroyed after the keyed services and before |
289 // the IO thread. | 288 // the IO thread. |
290 promo_resource_service_.reset(); | 289 promo_resource_service_.reset(); |
291 | 290 |
292 child_process_watcher_.reset(); | 291 child_process_watcher_.reset(); |
293 | 292 |
294 #if defined(ENABLE_EXTENSIONS) | 293 #if defined(ENABLE_EXTENSIONS) |
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 } | 1275 } |
1277 | 1276 |
1278 void BrowserProcessImpl::OnAutoupdateTimer() { | 1277 void BrowserProcessImpl::OnAutoupdateTimer() { |
1279 if (CanAutorestartForUpdate()) { | 1278 if (CanAutorestartForUpdate()) { |
1280 DLOG(WARNING) << "Detected update. Restarting browser."; | 1279 DLOG(WARNING) << "Detected update. Restarting browser."; |
1281 RestartBackgroundInstance(); | 1280 RestartBackgroundInstance(); |
1282 } | 1281 } |
1283 } | 1282 } |
1284 | 1283 |
1285 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1284 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |