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

Unified Diff: ash/shelf/shelf_tooltip_manager.h

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/pointer_watcher_delegate_aura.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_tooltip_manager.h
diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/shelf/shelf_tooltip_manager.h
index 390988ec1b87b1ac4d5da2f3350bdfe47ae10975..cccd7d3615fea46836156826ded5d2a4f935b027 100644
--- a/ash/shelf/shelf_tooltip_manager.h
+++ b/ash/shelf/shelf_tooltip_manager.h
@@ -12,7 +12,7 @@
#include "base/timer/timer.h"
#include "ui/aura/window_observer.h"
#include "ui/events/event_handler.h"
-#include "ui/views/pointer_down_watcher.h"
+#include "ui/views/pointer_watcher.h"
namespace views {
class BubbleDialogDelegateView;
@@ -31,7 +31,7 @@ class ShelfViewTest;
// ShelfTooltipManager manages the tooltip bubble that appears for shelf items.
class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler,
public aura::WindowObserver,
- public views::PointerDownWatcher,
+ public views::PointerWatcher,
public ShelfLayoutManagerObserver {
public:
explicit ShelfTooltipManager(ShelfView* shelf_view);
@@ -63,7 +63,7 @@ class ASH_EXPORT ShelfTooltipManager : public ui::EventHandler,
// aura::WindowObserver overrides:
void OnWindowDestroying(aura::Window* window) override;
- // views::PointerDownWatcher overrides:
+ // views::PointerWatcher overrides:
void OnMousePressed(const ui::MouseEvent& event,
const gfx::Point& location_in_screen,
views::Widget* target) override;
« no previous file with comments | « ash/pointer_watcher_delegate_aura.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698