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

ui/views/examples/content_client/examples_browser_main_parts.h

 // 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.
 
 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 
+namespace aura {
+namespace client {
+class StackingClient;
+}
+}
+
 namespace base {
 class Thread;
 }
 
 namespace ui {
 class Clipboard;
 }
 
 namespace content {
 
@@ skipping 33 matching lines @@
     return browser_context_.get();
   }
 
  private:
   scoped_ptr<content::ShellBrowserContext> browser_context_;
 
   scoped_ptr<ui::Clipboard> clipboard_;
   content::ShellDevToolsDelegate* devtools_delegate_;
   scoped_ptr<views::ViewsDelegate> views_delegate_;
 #if defined(USE_AURA)
-  scoped_ptr<aura::client::StackingClient> root_window_stacking_client_;
+  scoped_ptr<aura::client::StackingClient> stacking_client_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
 };
 
 }  // namespace examples
 }  // namespace views
 
 #endif  // UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_