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

Unified Diff: ash/common/wm_shell.cc

Issue 2231533004: Pointer watcher modifications to support laser pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 4 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/common/wm_shell.h ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 6d629cb9fdf30883d2eb9d38b48f61a8cef6079c..4600eea835f4d4428efbeacd35cb880e8dc9fa6e 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -35,6 +35,7 @@
#include "ui/app_list/presenter/app_list_presenter.h"
#include "ui/display/display.h"
#include "ui/views/focus/focus_manager_factory.h"
+#include "ui/wm/core/cursor_manager.h"
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
@@ -273,4 +274,8 @@ void WmShell::SetAcceleratorController(
accelerator_controller_ = std::move(accelerator_controller);
}
+void WmShell::SetCursorManager(
+ std::unique_ptr<::wm::CursorManager> cursor_manager) {
+ cursor_manager_ = std::move(cursor_manager);
+}
} // namespace ash
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698