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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9701098: MultiMonitor support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shutdown order Created 8 years, 9 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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f3346123f4807576329b341276b251ec4d7f5638..13e3067998bf71b4173f81cfc48a2816d5b21627 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -342,14 +342,14 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
#endif
-#if defined(USE_AURA)
- main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
-#endif
-
#if defined(USE_ASH)
main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
#endif
+#if defined(USE_AURA)
+ main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
+#endif
+
return main_parts;
}

Powered by Google App Engine
This is Rietveld 408576698