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

Side by Side Diff: ash/system/chromeos/power/power_status_view.h

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/chromeos/network/tray_sms.cc ('k') | ash/system/chromeos/power/power_status_view.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 (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() OVERRIDE; 31 virtual gfx::Size GetPreferredSize() const OVERRIDE;
32 virtual int GetHeightForWidth(int width) 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();
(...skipping 20 matching lines...) Expand all
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/network/tray_sms.cc ('k') | ash/system/chromeos/power/power_status_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698