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

Unified Diff: chrome/browser/browser_process_impl.h

Issue 10388211: Fix crash in policy code caused by early shutdown. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed typo Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 425cecca1696636c5de04636367844ebfd7e1449..101fe846bda928c9c42fcc7a2a8ae6e1b552f82e 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -154,6 +154,11 @@ class BrowserProcessImpl : public BrowserProcess,
bool created_watchdog_thread_;
scoped_ptr<WatchDogThread> watchdog_thread_;
+ // Must be destroyed after |policy_service_| if StartTearDown() isn't invoked
+ // during an early shutdown.
+ bool created_browser_policy_connector_;
+ scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
+
// Must be destroyed after |local_state_|.
scoped_ptr<policy::PolicyService> policy_service_;
@@ -171,9 +176,6 @@ class BrowserProcessImpl : public BrowserProcess,
scoped_ptr<RemoteDebuggingServer> remote_debugging_server_;
- bool created_browser_policy_connector_;
- scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
-
scoped_refptr<printing::PrintPreviewTabController>
print_preview_tab_controller_;
« no previous file with comments | « no previous file | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698