MacViews: Fix BrowserClient for toolkit-views on Mac

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 718 matching lines @@
   main_parts = new ChromeBrowserMainPartsPosix(parameters);
 #else
   NOTREACHED();
   main_parts = new ChromeBrowserMainParts(parameters);
 #endif
 
   chrome::AddProfilesExtraParts(main_parts);
 
   // 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
 
 #if defined(USE_ASH)
   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
 
   chrome::AddMetricsExtraParts(main_parts);
 
   return main_parts;
 }
 
 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
@@ skipping 2154 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome