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

Side by Side Diff: ash/system/tray/throbber_view.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/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_SYSTEM_TRAY_THROBBER_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_THROBBER_VIEW_H_
6 #define ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_THROBBER_VIEW_H_
7 7
8 #include "ui/gfx/size.h" 8 #include "ui/gfx/size.h"
9 #include "ui/views/controls/throbber.h" 9 #include "ui/views/controls/throbber.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 // A SmoothedThrobber with tooltip. 14 // A SmoothedThrobber with tooltip.
15 class SystemTrayThrobber : public views::SmoothedThrobber { 15 class SystemTrayThrobber : public views::SmoothedThrobber {
16 public: 16 public:
17 SystemTrayThrobber(int frame_delay_ms); 17 SystemTrayThrobber(int frame_delay_ms);
18 virtual ~SystemTrayThrobber(); 18 virtual ~SystemTrayThrobber();
19 19
20 void SetTooltipText(const base::string16& tooltip_text); 20 void SetTooltipText(const base::string16& tooltip_text);
21 21
22 // Overriden from views::View. 22 // Overriden from views::View.
23 virtual bool GetTooltipText( 23 virtual bool GetTooltipText(
24 const gfx::Point& p, base::string16* tooltip) const OVERRIDE; 24 const gfx::Point& p, base::string16* tooltip) const override;
25 25
26 private: 26 private:
27 // The current tooltip text. 27 // The current tooltip text.
28 base::string16 tooltip_text_; 28 base::string16 tooltip_text_;
29 29
30 DISALLOW_COPY_AND_ASSIGN(SystemTrayThrobber); 30 DISALLOW_COPY_AND_ASSIGN(SystemTrayThrobber);
31 }; 31 };
32 32
33 // A View containing a SystemTrayThrobber with animation for starting/stopping. 33 // A View containing a SystemTrayThrobber with animation for starting/stopping.
34 class ThrobberView : public views::View { 34 class ThrobberView : public views::View {
35 public: 35 public:
36 ThrobberView(); 36 ThrobberView();
37 virtual ~ThrobberView(); 37 virtual ~ThrobberView();
38 38
39 void Start(); 39 void Start();
40 void Stop(); 40 void Stop();
41 void SetTooltipText(const base::string16& tooltip_text); 41 void SetTooltipText(const base::string16& tooltip_text);
42 42
43 // Overriden from views::View. 43 // Overriden from views::View.
44 virtual gfx::Size GetPreferredSize() const OVERRIDE; 44 virtual gfx::Size GetPreferredSize() const override;
45 virtual void Layout() OVERRIDE; 45 virtual void Layout() override;
46 virtual bool GetTooltipText( 46 virtual bool GetTooltipText(
47 const gfx::Point& p, base::string16* tooltip) const OVERRIDE; 47 const gfx::Point& p, base::string16* tooltip) const override;
48 48
49 private: 49 private:
50 // Schedules animation for starting/stopping throbber. 50 // Schedules animation for starting/stopping throbber.
51 void ScheduleAnimation(bool start_throbber); 51 void ScheduleAnimation(bool start_throbber);
52 52
53 SystemTrayThrobber* throbber_; 53 SystemTrayThrobber* throbber_;
54 54
55 // The current tooltip text. 55 // The current tooltip text.
56 base::string16 tooltip_text_; 56 base::string16 tooltip_text_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ThrobberView); 58 DISALLOW_COPY_AND_ASSIGN(ThrobberView);
59 }; 59 };
60 60
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ 63 #endif // ASH_SYSTEM_TRAY_THROBBER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698