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

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

Issue 2186213002: Revert of Ensure BrowserThread::CurrentlyOn is correct through MessageLoop teardown (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | chrome/browser/policy/cloud/component_cloud_policy_browsertest.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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 update_client::UpdateQueryParams::SetDelegate( 250 update_client::UpdateQueryParams::SetDelegate(
251 ChromeUpdateQueryParamsDelegate::GetInstance()); 251 ChromeUpdateQueryParamsDelegate::GetInstance());
252 252
253 #if !defined(OS_ANDROID) 253 #if !defined(OS_ANDROID)
254 KeepAliveRegistry::GetInstance()->AddObserver(this); 254 KeepAliveRegistry::GetInstance()->AddObserver(this);
255 #endif // !defined(OS_ANDROID) 255 #endif // !defined(OS_ANDROID)
256 } 256 }
257 257
258 BrowserProcessImpl::~BrowserProcessImpl() { 258 BrowserProcessImpl::~BrowserProcessImpl() {
259 #if defined(ENABLE_EXTENSIONS)
260 extensions::ExtensionsBrowserClient::Set(nullptr);
261 #endif
262
263 #if !defined(OS_ANDROID) 259 #if !defined(OS_ANDROID)
264 KeepAliveRegistry::GetInstance()->RemoveObserver(this); 260 KeepAliveRegistry::GetInstance()->RemoveObserver(this);
265 #endif // !defined(OS_ANDROID) 261 #endif // !defined(OS_ANDROID)
266 262
267 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); 263 tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
268 264
269 g_browser_process = NULL; 265 g_browser_process = NULL;
270 } 266 }
271 267
272 #if !defined(OS_ANDROID) 268 #if !defined(OS_ANDROID)
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 } 1331 }
1336 1332
1337 void BrowserProcessImpl::OnAutoupdateTimer() { 1333 void BrowserProcessImpl::OnAutoupdateTimer() {
1338 if (CanAutorestartForUpdate()) { 1334 if (CanAutorestartForUpdate()) {
1339 DLOG(WARNING) << "Detected update. Restarting browser."; 1335 DLOG(WARNING) << "Detected update. Restarting browser.";
1340 RestartBackgroundInstance(); 1336 RestartBackgroundInstance();
1341 } 1337 }
1342 } 1338 }
1343 1339
1344 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1340 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698