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

chrome/browser/chrome_browser_main_extra_parts_aura.h

Index: chrome/browser/chrome_browser_main_extra_parts_aura.h
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.h b/chrome/browser/chrome_browser_main_extra_parts_aura.h
index e92a6792350e8672f4fc5b9065025e88d12791d6..4fe4e7e890926c369c71b518cac6efacb0c32c1c 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.h
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.h
@@ -9,13 +9,26 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 
+#if !defined(USE_ASH)
+#include "base/memory/scoped_ptr.h"
+#endif
+
+namespace aura {
+class DesktopStackingClient;
+}
+
 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
  public:
   ChromeBrowserMainExtraPartsAura();
 
+  virtual void PreProfileInit() OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
 
  private:
+#if !defined(USE_ASH)
+  scoped_ptr<aura::DesktopStackingClient> stacking_client_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
 };