Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Unified Diff: ui/views/examples/content_client/examples_browser_main_parts.h

Issue 10083057: Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/examples/content_client/examples_browser_main_parts.h
===================================================================
--- ui/views/examples/content_client/examples_browser_main_parts.h (revision 132861)
+++ ui/views/examples/content_client/examples_browser_main_parts.h (working copy)
@@ -10,12 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/browser_main_parts.h"
-namespace aura {
-namespace client {
-class StackingClient;
-}
-}
-
namespace base {
class Thread;
}
@@ -69,7 +63,7 @@
content::ShellDevToolsDelegate* devtools_delegate_;
scoped_ptr<views::ViewsDelegate> views_delegate_;
#if defined(USE_AURA)
- scoped_ptr<aura::client::StackingClient> stacking_client_;
+ scoped_ptr<aura::client::StackingClient> root_window_stacking_client_;
#endif
DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
« no previous file with comments | « ui/aura/desktop/desktop_stacking_client.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698