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

Unified Diff: trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.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
Index: trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
===================================================================
--- trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h (revision 255397)
+++ trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h (working copy)
@@ -15,6 +15,12 @@
class BrowserFrame;
class BrowserView;
+namespace aura {
+namespace client {
+class UserActionClient;
+}
+}
+
namespace views {
namespace corewm {
class VisibilityController;
@@ -57,6 +63,7 @@
// Owned by the RootWindow.
BrowserDesktopWindowTreeHost* browser_desktop_window_tree_host_;
+ scoped_ptr<aura::client::UserActionClient> user_action_client_;
scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);

Powered by Google App Engine
This is Rietveld 408576698