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

chrome/browser/chrome_browser_main_extra_parts_aura.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_browser_main_extra_parts_aura.h"
 
 #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.
 }