diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 23:11:47 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 23:11:47 +0000 |
| commit | 4189bc224a8f5358cd3796eba81c6a7ed20a2595 (patch) | |
| tree | 39fb7c40fd3312f1520c69fb95556febfa886110 /chrome/browser/browser_process_impl.cc | |
| parent | 313ef41d286d99b553b6a7e6267638d5937423da (diff) | |
| download | chromium_src-4189bc224a8f5358cd3796eba81c6a7ed20a2595.zip chromium_src-4189bc224a8f5358cd3796eba81c6a7ed20a2595.tar.gz chromium_src-4189bc224a8f5358cd3796eba81c6a7ed20a2595.tar.bz2 | |
*Move aura::Env::DeleteInstance to BrowserProcessImpl::StartTearDown which is executed after MetricsService records Monitor size.
* Keep monitor objects instead of deleting them when root window is deleted. MetricsService needs this after Shell's root window is deleted.
* Moved Monitor class'es destructor to .cc as it has non trivial destructor.
R=ben@chromium.org
BUG=120563
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9791080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 10d14ed..ad7e4c1 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -84,6 +84,10 @@ #include "chrome/browser/chrome_browser_main_mac.h" #endif +#if defined(USE_AURA) +#include "ui/aura/env.h" +#endif + #if defined(OS_CHROMEOS) #include "chrome/browser/oom_priority_manager.h" #endif // defined(OS_CHROMEOS) @@ -212,6 +216,12 @@ void BrowserProcessImpl::StartTearDown() { // Stop the watchdog thread before stopping other threads. watchdog_thread_.reset(); + +#if defined(USE_AURA) + // Delete aura after the metrics service has been deleted as it accesses + // monitor information. + aura::Env::DeleteInstance(); +#endif } void BrowserProcessImpl::PostDestroyThreads() { |