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

Side by Side Diff: ash/shelf/shelf_tooltip_manager.h

Issue 2163453002: mus: Change PointerWatcher to watch for all events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back location 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
6 #define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 6 #define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_layout_manager_observer.h" 9 #include "ash/shelf/shelf_layout_manager_observer.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void set_timer_delay_for_test(int timer_delay) { timer_delay_ = timer_delay; } 57 void set_timer_delay_for_test(int timer_delay) { timer_delay_ = timer_delay; }
58 58
59 protected: 59 protected:
60 // ui::EventHandler overrides: 60 // ui::EventHandler overrides:
61 void OnEvent(ui::Event* event) override; 61 void OnEvent(ui::Event* event) override;
62 62
63 // aura::WindowObserver overrides: 63 // aura::WindowObserver overrides:
64 void OnWindowDestroying(aura::Window* window) override; 64 void OnWindowDestroying(aura::Window* window) override;
65 65
66 // views::PointerWatcher overrides: 66 // views::PointerWatcher overrides:
67 void OnMousePressed(const ui::MouseEvent& event, 67 void OnPointerEventObserved(const ui::LocatedEvent& event,
68 const gfx::Point& location_in_screen, 68 const gfx::Point& location_in_screen,
69 views::Widget* target) override; 69 views::Widget* target) override;
70 void OnTouchPressed(const ui::TouchEvent& event,
71 const gfx::Point& location_in_screen,
72 views::Widget* target) override;
73 70
74 // ShelfLayoutManagerObserver overrides: 71 // ShelfLayoutManagerObserver overrides:
75 void WillDeleteShelfLayoutManager() override; 72 void WillDeleteShelfLayoutManager() override;
76 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; 73 void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
77 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; 74 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
78 75
79 private: 76 private:
80 class ShelfTooltipBubble; 77 class ShelfTooltipBubble;
81 friend class test::ShelfViewTest; 78 friend class test::ShelfViewTest;
82 friend class test::ShelfTooltipManagerTest; 79 friend class test::ShelfTooltipManagerTest;
(...skipping 10 matching lines...) Expand all
93 views::BubbleDialogDelegateView* bubble_; 90 views::BubbleDialogDelegateView* bubble_;
94 91
95 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_; 92 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_;
96 93
97 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager); 94 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager);
98 }; 95 };
99 96
100 } // namespace ash 97 } // namespace ash
101 98
102 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 99 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698