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

Side by Side Diff: ui/views/corewm/tooltip_controller.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/views/corewm/tooltip_aura.h ('k') | ui/views/corewm/tooltip_controller_test_helper.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_ 5 #ifndef UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_
6 #define UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_ 6 #define UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 31
32 // TooltipController provides tooltip functionality for aura. 32 // TooltipController provides tooltip functionality for aura.
33 class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient, 33 class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
34 public ui::EventHandler, 34 public ui::EventHandler,
35 public aura::WindowObserver { 35 public aura::WindowObserver {
36 public: 36 public:
37 explicit TooltipController(scoped_ptr<Tooltip> tooltip); 37 explicit TooltipController(scoped_ptr<Tooltip> tooltip);
38 virtual ~TooltipController(); 38 virtual ~TooltipController();
39 39
40 // Overridden from aura::client::TooltipClient. 40 // Overridden from aura::client::TooltipClient.
41 virtual void UpdateTooltip(aura::Window* target) OVERRIDE; 41 virtual void UpdateTooltip(aura::Window* target) override;
42 virtual void SetTooltipShownTimeout(aura::Window* target, 42 virtual void SetTooltipShownTimeout(aura::Window* target,
43 int timeout_in_ms) OVERRIDE; 43 int timeout_in_ms) override;
44 virtual void SetTooltipsEnabled(bool enable) OVERRIDE; 44 virtual void SetTooltipsEnabled(bool enable) override;
45 45
46 // Overridden from ui::EventHandler. 46 // Overridden from ui::EventHandler.
47 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 47 virtual void OnKeyEvent(ui::KeyEvent* event) override;
48 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 48 virtual void OnMouseEvent(ui::MouseEvent* event) override;
49 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 49 virtual void OnTouchEvent(ui::TouchEvent* event) override;
50 virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE; 50 virtual void OnCancelMode(ui::CancelModeEvent* event) override;
51 51
52 // Overridden from aura::WindowObserver. 52 // Overridden from aura::WindowObserver.
53 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 53 virtual void OnWindowDestroyed(aura::Window* window) override;
54 54
55 const gfx::Point& mouse_location() const { return curr_mouse_loc_; } 55 const gfx::Point& mouse_location() const { return curr_mouse_loc_; }
56 56
57 private: 57 private:
58 friend class test::TooltipControllerTestHelper; 58 friend class test::TooltipControllerTestHelper;
59 59
60 void TooltipTimerFired(); 60 void TooltipTimerFired();
61 void TooltipShownTimerFired(); 61 void TooltipShownTimerFired();
62 62
63 // Updates the tooltip if required (if there is any change in the tooltip 63 // Updates the tooltip if required (if there is any change in the tooltip
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 std::map<aura::Window*, int> tooltip_shown_timeout_map_; 103 std::map<aura::Window*, int> tooltip_shown_timeout_map_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(TooltipController); 105 DISALLOW_COPY_AND_ASSIGN(TooltipController);
106 }; 106 };
107 107
108 } // namespace corewm 108 } // namespace corewm
109 } // namespace views 109 } // namespace views
110 110
111 #endif // UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_ 111 #endif // UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/tooltip_aura.h ('k') | ui/views/corewm/tooltip_controller_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698