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

Unified Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 52783003: linux_aura: Move the first creation of DesktopScreen after ResourceBundle initialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
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.
-}

Powered by Google App Engine
This is Rietveld 408576698