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

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

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback Created 5 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
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)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698