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

Unified Diff: ash/shell.cc

Issue 1921673005: mus: Add PointerWatcher for passively observing mouse and touch events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 96f3aa8ec160a8e081993bcda5c8768e35709519..06affeabc2e4ffd5838a56a4b31e5020ee71d902 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -37,6 +37,7 @@
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/media_delegate.h"
#include "ash/new_window_delegate.h"
+#include "ash/pointer_watcher_delegate.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_state_delegate.h"
#include "ash/shelf/app_list_shelf_item_delegate.h"
@@ -491,6 +492,14 @@ void Shell::RemoveShellObserver(ShellObserver* observer) {
observers_.RemoveObserver(observer);
}
+void Shell::AddPointerWatcher(views::PointerWatcher* watcher) {
+ pointer_watcher_delegate_->AddPointerWatcher(watcher);
+}
+
+void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) {
+ pointer_watcher_delegate_->RemovePointerWatcher(watcher);
+}
+
#if defined(OS_CHROMEOS)
bool Shell::ShouldSaveDisplaySettings() {
return !(screen_orientation_controller_
@@ -831,6 +840,7 @@ Shell::~Shell() {
accessibility_delegate_.reset();
new_window_delegate_.reset();
media_delegate_.reset();
+ pointer_watcher_delegate_.reset();
keyboard::KeyboardController::ResetInstance(nullptr);
@@ -1069,6 +1079,7 @@ void Shell::Init(const ShellInitParams& init_params) {
accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
new_window_delegate_.reset(delegate_->CreateNewWindowDelegate());
media_delegate_.reset(delegate_->CreateMediaDelegate());
+ pointer_watcher_delegate_ = delegate_->CreatePointerWatcherDelegate();
resize_shadow_controller_.reset(new ResizeShadowController());
shadow_controller_.reset(
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698