Aura/ash split: Remove hacks and get chrome linking without ash.

chrome/browser/chrome_browser_main_extra_parts_aura.cc

Index: chrome/browser/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index 97e9dc64568866bbc38c532569df3da114dd5254..68a6178bb2a30f315b8e285b5ea4558664051fa6 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -6,11 +6,27 @@
 
 #include "ui/aura/env.h"
 
+#if !defined(USE_ASH)
+#include "ui/aura/desktop/desktop_stacking_client.h"
+#include "ui/views/widget/native_widget_aura.h"
+#endif  // !USE_ASH
+
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
     : ChromeBrowserMainExtraParts() {
 }
 
+void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
+#if !defined(USE_ASH)
+  stacking_client_.reset(new aura::DesktopStackingClient);
+  views::NativeWidgetAura::set_aura_desktop_hax();

[Ben Goodger (Google), 2012/04/13 22:57:03]

can you give this a proper name at least?

+#endif  // !USE_ASH
+}
+
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
+#if !defined(USE_ASH)
+  stacking_client_.reset();
+#endif
+
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }