MacViews: Fix BrowserClient for toolkit-views on Mac

chrome/browser/chrome_content_browser_client.cc

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 b0716a9223a25765c9b01a3776aa044f482cb491..0a2fd506a6f6b94f956b4cbee26a4478bfdb26f8 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -736,6 +736,10 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
 
   // Construct additional browser parts. Stages are called in the order in
   // which they are added.
+#if defined(USE_AURA)
+  main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
+#endif

[tapted, 2014/07/17 13:55:04]

Moved this up because Ash does stuff like `OpenAsh` which I think needs the
WMState. This also seems nicer from a dependency perspective (i.e. do Aura
first, since views and ash depend on it).

[sky, 2014/07/17 16:12:13]

I this code would be cleaner if we keep ChromeBrowserMainExtraPartsAura as
*just* aura, eg no views. ChromeBrowserMainExtraPartsViews inits views and any
aura-views dependencies. This does imply a bit of shuffling of this code. WDYT?

+
 #if defined(TOOLKIT_VIEWS)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
 #endif
@@ -744,10 +748,6 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 #endif
 
-#if defined(USE_AURA)
-  main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
-#endif
-
 #if defined(USE_X11)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsX11());
 #endif