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

Unified Diff: trunk/src/ash/shell.h

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 | « no previous file | trunk/src/ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/shell.h
===================================================================
--- trunk/src/ash/shell.h (revision 255397)
+++ trunk/src/ash/shell.h (working copy)
@@ -40,6 +40,7 @@
namespace client {
class ActivationClient;
class FocusClient;
+class UserActionClient;
}
}
namespace chromeos {
@@ -665,6 +666,7 @@
scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
scoped_ptr<AutoclickController> autoclick_controller_;
scoped_ptr<aura::client::FocusClient> focus_client_;
+ scoped_ptr<aura::client::UserActionClient> user_action_client_;
aura::client::ActivationClient* activation_client_;
scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
« no previous file with comments | « no previous file | trunk/src/ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698