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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/shelf/shelf_navigator_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 bool IsVisible(); 71 bool IsVisible();
72 72
73 // Returns the view to which the tooltip bubble is anchored. May be NULL. 73 // Returns the view to which the tooltip bubble is anchored. May be NULL.
74 views::View* GetCurrentAnchorView() { return anchor_; } 74 views::View* GetCurrentAnchorView() { return anchor_; }
75 75
76 // Create an instant timer for test purposes. 76 // Create an instant timer for test purposes.
77 void CreateZeroDelayTimerForTest(); 77 void CreateZeroDelayTimerForTest();
78 78
79 protected: 79 protected:
80 // ui::EventHandler overrides: 80 // ui::EventHandler overrides:
81 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 81 virtual void OnMouseEvent(ui::MouseEvent* event) override;
82 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 82 virtual void OnTouchEvent(ui::TouchEvent* event) override;
83 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 83 virtual void OnGestureEvent(ui::GestureEvent* event) override;
84 virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE; 84 virtual void OnCancelMode(ui::CancelModeEvent* event) override;
85 85
86 // ShelfLayoutManagerObserver overrides: 86 // ShelfLayoutManagerObserver overrides:
87 virtual void WillDeleteShelf() OVERRIDE; 87 virtual void WillDeleteShelf() override;
88 virtual void WillChangeVisibilityState( 88 virtual void WillChangeVisibilityState(
89 ShelfVisibilityState new_state) OVERRIDE; 89 ShelfVisibilityState new_state) override;
90 virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE; 90 virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
91 91
92 private: 92 private:
93 class ShelfTooltipBubble; 93 class ShelfTooltipBubble;
94 friend class test::ShelfViewTest; 94 friend class test::ShelfViewTest;
95 friend class test::ShelfTooltipManagerTest; 95 friend class test::ShelfTooltipManagerTest;
96 96
97 void CancelHidingAnimation(); 97 void CancelHidingAnimation();
98 void CloseSoon(); 98 void CloseSoon();
99 void ShowInternal(); 99 void ShowInternal();
100 void CreateBubble(views::View* anchor, const base::string16& text); 100 void CreateBubble(views::View* anchor, const base::string16& text);
101 void CreateTimer(int delay_in_ms); 101 void CreateTimer(int delay_in_ms);
102 102
103 ShelfTooltipBubble* view_; 103 ShelfTooltipBubble* view_;
104 views::Widget* widget_; 104 views::Widget* widget_;
105 views::View* anchor_; 105 views::View* anchor_;
106 base::string16 text_; 106 base::string16 text_;
107 scoped_ptr<base::Timer> timer_; 107 scoped_ptr<base::Timer> timer_;
108 108
109 ShelfLayoutManager* shelf_layout_manager_; 109 ShelfLayoutManager* shelf_layout_manager_;
110 ShelfView* shelf_view_; 110 ShelfView* shelf_view_;
111 111
112 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_; 112 base::WeakPtrFactory<ShelfTooltipManager> weak_factory_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager); 114 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipManager);
115 }; 115 };
116 116
117 } // namespace ash 117 } // namespace ash
118 118
119 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_ 119 #endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_navigator_unittest.cc ('k') | ash/shelf/shelf_tooltip_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698