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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.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: fix ash_shell_with_content 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
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 6d60f3ebfd36683f26bb1098f581766e88995b57..a8a71db4dc402672bd0428d113b0fb138b5fb9ac 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -7,9 +7,11 @@
#include <stddef.h>
#include "ash/content/gpu_support_impl.h"
+#include "ash/pointer_watcher_delegate_aura.h"
#include "ash/session/session_state_delegate.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/lifetime/application_lifetime.h"
@@ -154,6 +156,11 @@ ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
return shelf_delegate_;
}
+std::unique_ptr<ash::PointerWatcherDelegate>
+ChromeShellDelegate::CreatePointerWatcherDelegate() {
+ return base::WrapUnique(new ash::PointerWatcherDelegateAura);
+}
+
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
ash::Shelf* shelf,
const ash::ShelfItem* item) {

Powered by Google App Engine
This is Rietveld 408576698