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

Side by Side Diff: ash/system/chromeos/power/power_status_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
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 ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
6 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_ 6 #define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/chromeos/power/power_status.h" 9 #include "ash/system/chromeos/power/power_status.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 10 matching lines...) Expand all
21 public: 21 public:
22 enum ViewType { 22 enum ViewType {
23 VIEW_DEFAULT, 23 VIEW_DEFAULT,
24 VIEW_NOTIFICATION 24 VIEW_NOTIFICATION
25 }; 25 };
26 26
27 PowerStatusView(ViewType view_type, bool default_view_right_align); 27 PowerStatusView(ViewType view_type, bool default_view_right_align);
28 virtual ~PowerStatusView(); 28 virtual ~PowerStatusView();
29 29
30 // Overridden from views::View. 30 // Overridden from views::View.
31 virtual gfx::Size GetPreferredSize() const OVERRIDE; 31 virtual gfx::Size GetPreferredSize() const override;
32 virtual int GetHeightForWidth(int width) const OVERRIDE; 32 virtual int GetHeightForWidth(int width) const override;
33 virtual void Layout() OVERRIDE; 33 virtual void Layout() override;
34 34
35 // Overridden from PowerStatus::Observer. 35 // Overridden from PowerStatus::Observer.
36 virtual void OnPowerStatusChanged() OVERRIDE; 36 virtual void OnPowerStatusChanged() override;
37 37
38 private: 38 private:
39 friend class PowerStatusDefaultViewTest; 39 friend class PowerStatusDefaultViewTest;
40 friend class PowerStatusNotificationViewTest; 40 friend class PowerStatusNotificationViewTest;
41 41
42 void LayoutDefaultView(); 42 void LayoutDefaultView();
43 void LayoutNotificationView(); 43 void LayoutNotificationView();
44 void UpdateTextForDefaultView(); 44 void UpdateTextForDefaultView();
45 void UpdateTextForNotificationView(); 45 void UpdateTextForNotificationView();
46 46
47 // Overridden from views::View. 47 // Overridden from views::View.
48 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 48 virtual void ChildPreferredSizeChanged(views::View* child) override;
49 49
50 // Layout default view UI items on the right side of system tray pop up item 50 // Layout default view UI items on the right side of system tray pop up item
51 // if true; otherwise, layout the UI items on the left side. 51 // if true; otherwise, layout the UI items on the left side.
52 bool default_view_right_align_; 52 bool default_view_right_align_;
53 53
54 // Labels used only for VIEW_NOTIFICATION. 54 // Labels used only for VIEW_NOTIFICATION.
55 views::Label* status_label_; 55 views::Label* status_label_;
56 views::Label* time_label_; 56 views::Label* time_label_;
57 57
58 // Labels used only for VIEW_DEFAULT. 58 // Labels used only for VIEW_DEFAULT.
59 views::Label* time_status_label_; 59 views::Label* time_status_label_;
60 views::Label* percentage_label_; 60 views::Label* percentage_label_;
61 61
62 // Battery status indicator icon. 62 // Battery status indicator icon.
63 views::ImageView* icon_; 63 views::ImageView* icon_;
64 64
65 ViewType view_type_; 65 ViewType view_type_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(PowerStatusView); 67 DISALLOW_COPY_AND_ASSIGN(PowerStatusView);
68 }; 68 };
69 69
70 } // namespace ash 70 } // namespace ash
71 71
72 #endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_ 72 #endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/power_status_unittest.cc ('k') | ash/system/chromeos/power/power_status_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698