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

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts 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/shell_delegate_impl.h ('k') | ash/sysui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index b5e9d9ce456a84af572842d26afe97b0aeb6ead6..e3fee20c9fe9963827b8c627c017b29fdcafd1c9 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -15,7 +15,7 @@
#include "ash/common/wm/window_state.h"
#include "ash/default_user_wallpaper_delegate.h"
#include "ash/new_window_delegate.h"
-#include "ash/pointer_down_watcher_delegate_aura.h"
+#include "ash/pointer_watcher_delegate_aura.h"
#include "ash/shell.h"
#include "ash/shell/context_menu.h"
#include "ash/shell/example_factory.h"
@@ -243,9 +243,9 @@ ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
return new MediaDelegateImpl;
}
-std::unique_ptr<ash::PointerDownWatcherDelegate>
-ShellDelegateImpl::CreatePointerDownWatcherDelegate() {
- return base::WrapUnique(new PointerDownWatcherDelegateAura);
+std::unique_ptr<ash::PointerWatcherDelegate>
+ShellDelegateImpl::CreatePointerWatcherDelegate() {
+ return base::WrapUnique(new PointerWatcherDelegateAura);
}
ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf,
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/sysui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698