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

Unified Diff: ash/shell.cc

Issue 2158273003: mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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 d91499863a6dc20dd7335d2aa174a1e9338c5ce4..e77f43fd8c76e57a70dbac523a6ca719cb3f54fb 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -18,7 +18,7 @@
#include "ash/common/gpu_support.h"
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/login_status.h"
-#include "ash/common/pointer_watcher_delegate.h"
+#include "ash/common/pointer_down_watcher_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_item_delegate.h"
#include "ash/common/shelf/shelf_item_delegate_manager.h"
@@ -458,12 +458,12 @@ void Shell::ShutdownShelf() {
}
}
-void Shell::AddPointerWatcher(views::PointerWatcher* watcher) {
- pointer_watcher_delegate_->AddPointerWatcher(watcher);
+void Shell::AddPointerDownWatcher(views::PointerDownWatcher* watcher) {
+ pointer_down_watcher_delegate_->AddPointerDownWatcher(watcher);
}
-void Shell::RemovePointerWatcher(views::PointerWatcher* watcher) {
- pointer_watcher_delegate_->RemovePointerWatcher(watcher);
+void Shell::RemovePointerDownWatcher(views::PointerDownWatcher* watcher) {
+ pointer_down_watcher_delegate_->RemovePointerDownWatcher(watcher);
}
#if defined(OS_CHROMEOS)
@@ -770,7 +770,7 @@ Shell::~Shell() {
focus_client_.reset();
screen_position_controller_.reset();
new_window_delegate_.reset();
- pointer_watcher_delegate_.reset();
+ pointer_down_watcher_delegate_.reset();
keyboard::KeyboardController::ResetInstance(nullptr);
@@ -1013,8 +1013,8 @@ void Shell::Init(const ShellInitParams& init_params) {
session_state_delegate_.reset(
wm_shell_->delegate()->CreateSessionStateDelegate());
new_window_delegate_.reset(wm_shell_->delegate()->CreateNewWindowDelegate());
- pointer_watcher_delegate_ =
- wm_shell_->delegate()->CreatePointerWatcherDelegate();
+ pointer_down_watcher_delegate_ =
+ wm_shell_->delegate()->CreatePointerDownWatcherDelegate();
resize_shadow_controller_.reset(new ResizeShadowController());
shadow_controller_.reset(new ::wm::ShadowController(activation_client_));
« 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