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

Unified Diff: trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc

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.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc (revision 255397)
+++ trunk/src/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc (working copy)
@@ -8,6 +8,7 @@
#include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"
#include "chrome/browser/ui/views/frame/browser_shutdown.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/desktop_user_action_handler_aura.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "ui/aura/client/aura_constants.h"
@@ -67,6 +68,11 @@
browser_desktop_window_tree_host_->AsDesktopWindowTreeHost();
DesktopNativeWidgetAura::InitNativeWidget(modified_params);
+ user_action_client_.reset(
+ new DesktopUserActionHandlerAura(browser_view_->browser()));
+ aura::client::SetUserActionClient(GetNativeView()->GetRootWindow(),
+ user_action_client_.get());
+
visibility_controller_.reset(new views::corewm::VisibilityController);
aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(),
visibility_controller_.get());

Powered by Google App Engine
This is Rietveld 408576698