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

Unified Diff: ash/shell.h

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
===================================================================
--- ash/shell.h (revision 177189)
+++ ash/shell.h (working copy)
@@ -33,6 +33,7 @@
namespace client {
class ActivationClient;
class FocusClient;
+class StackingClient;
class UserActionClient;
}
}
@@ -428,6 +429,8 @@
}
#endif // defined(OS_CHROMEOS)
+ aura::client::StackingClient* stacking_client();
+
RootWindowHostFactory* root_window_host_factory() {
return root_window_host_factory_.get();
}
@@ -508,6 +511,7 @@
scoped_ptr<internal::AppListController> app_list_controller_;
+ scoped_ptr<aura::client::StackingClient> stacking_client_;
scoped_ptr<internal::ActivationController> activation_controller_;
scoped_ptr<internal::CaptureController> capture_controller_;
scoped_ptr<internal::DragDropController> drag_drop_controller_;
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698