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

Unified Diff: ash/ash.gyp

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 | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 8834013c2839aad04c2acc41635f8becfbcfd869..333565584e40e13671c0b80951b4b73f2c708995 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -83,7 +83,7 @@
'common/metrics/user_metrics_action.h',
'common/multi_profile_uma.cc',
'common/multi_profile_uma.h',
- 'common/pointer_down_watcher_delegate.h',
+ 'common/pointer_watcher_delegate.h',
'common/popup_message.cc',
'common/popup_message.h',
'common/root_window_controller_common.cc',
@@ -592,8 +592,8 @@
'metrics/task_switch_time_tracker.h',
'metrics/user_metrics_recorder.cc',
'metrics/user_metrics_recorder.h',
- 'pointer_down_watcher_delegate_aura.cc',
- 'pointer_down_watcher_delegate_aura.h',
+ 'pointer_watcher_delegate_aura.cc',
+ 'pointer_watcher_delegate_aura.h',
'root_window_controller.cc',
'root_window_controller.h',
'root_window_settings.cc',
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698