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

Unified Diff: trunk/src/ash/shell_delegate.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 | « trunk/src/ash/shell/shell_delegate_impl.cc ('k') | trunk/src/ash/test/test_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/shell_delegate.h
===================================================================
--- trunk/src/ash/shell_delegate.h (revision 255397)
+++ trunk/src/ash/shell_delegate.h (working copy)
@@ -19,7 +19,10 @@
namespace aura {
class RootWindow;
class Window;
+namespace client {
+class UserActionClient;
}
+}
namespace content {
class BrowserContext;
@@ -120,6 +123,9 @@
// Creates a media delegate. Shell takes ownership of the delegate.
virtual MediaDelegate* CreateMediaDelegate() = 0;
+ // Creates a user action client. Shell takes ownership of the object.
+ virtual aura::client::UserActionClient* CreateUserActionClient() = 0;
+
// Creates a menu model of the context for the |root_window|.
// When a ContextMenu is used for an item created by ShelfWindowWatcher,
// passes its ShelfItemDelegate and ShelfItem.
« no previous file with comments | « trunk/src/ash/shell/shell_delegate_impl.cc ('k') | trunk/src/ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698