| Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
|
| diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
|
| index 3fd43ffbf3381262cef4680690e7e87508160f6d..e39e980cbfb824b241be2e65d209eed97d8b77b7 100644
|
| --- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
|
| +++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
|
| @@ -68,7 +68,14 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
|
| #endif
|
| }
|
|
|
| -void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopStart() {
|
| +void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
|
| + active_desktop_monitor_.reset();
|
| +
|
| + // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
|
| + // after the metrics service is deleted.
|
| +}
|
| +
|
| +void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
|
| #if !defined(OS_CHROMEOS)
|
| #if defined(USE_ASH)
|
| if (!chrome::ShouldOpenAshOnStartup())
|
| @@ -79,10 +86,3 @@ void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopStart() {
|
| }
|
| #endif
|
| }
|
| -
|
| -void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
|
| - active_desktop_monitor_.reset();
|
| -
|
| - // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
|
| - // after the metrics service is deleted.
|
| -}
|
|
|