diff options
author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 22:50:24 +0000 |
---|---|---|
committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 22:50:24 +0000 |
commit | 3ba226c5d3494fbe754c860366f7126cd51df9d2 (patch) | |
tree | ebf829af0758ab41b0912fefd0b7a7f88080f6fe /chrome | |
parent | de99a643650df35457d0a0ca33f0c51c981890a6 (diff) | |
download | chromium_src-3ba226c5d3494fbe754c860366f7126cd51df9d2.zip chromium_src-3ba226c5d3494fbe754c860366f7126cd51df9d2.tar.gz chromium_src-3ba226c5d3494fbe754c860366f7126cd51df9d2.tar.bz2 |
Flipping the order of BackgroundModeManager and StatusTray members so that the StatusTray is not deleted before the BackgroundModeManager. Technically this should not be an issue, but it can occur if the NOTIFICATION_APP_TERMINATING notification is not sent.
BUG=101082
TEST=passes existing, but there are no repro steps for the crash to test
Review URL: http://codereview.chromium.org/8393028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/browser_process_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index f558ad9..b6ce12d 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -247,10 +247,10 @@ class BrowserProcessImpl : public BrowserProcess, scoped_ptr<TabCloseableStateWatcher> tab_closeable_state_watcher_; - scoped_ptr<BackgroundModeManager> background_mode_manager_; - scoped_ptr<StatusTray> status_tray_; + scoped_ptr<BackgroundModeManager> background_mode_manager_; + bool created_safe_browsing_service_; scoped_refptr<SafeBrowsingService> safe_browsing_service_; |