re-re-land of https://codereview.chromium.org/11364053/

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
index 1f4128a70db37e6a71eabd8d685eb3e26187877b..3f0784ae87cb7ebc9c265a222e0cf2fb5be2c7d4 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
@@ -10,8 +10,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 
-namespace views {
-class DesktopStackingClient;
+namespace aura {
+namespace client {
+class StackingClient;
+}
 }
 
 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
@@ -24,7 +26,7 @@ class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
   virtual void PostMainMessageLoopRun() OVERRIDE;
 
  private:
-  scoped_ptr<views::DesktopStackingClient> stacking_client_;
+  scoped_ptr<aura::client::StackingClient> stacking_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
 };