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

Side by Side Diff: ash/system/power/tray_power.h

Issue 10809008: Make spacing between uber tray items consistent with UI spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move SetTrayImageItemBorder etc to tray_views. Created 8 years, 5 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/network/tray_network.cc ('k') | ash/system/power/tray_power.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_POWER_TRAY_POWER_H_ 5 #ifndef ASH_SYSTEM_POWER_TRAY_POWER_H_
6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_ 6 #define ASH_SYSTEM_POWER_TRAY_POWER_H_
7 7
8 #include "ash/system/power/power_status_observer.h" 8 #include "ash/system/power/power_status_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // Overridden from SystemTrayItem. 46 // Overridden from SystemTrayItem.
47 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 47 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
48 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 48 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
49 virtual views::View* CreateNotificationView( 49 virtual views::View* CreateNotificationView(
50 user::LoginStatus status) OVERRIDE; 50 user::LoginStatus status) OVERRIDE;
51 virtual void DestroyTrayView() OVERRIDE; 51 virtual void DestroyTrayView() OVERRIDE;
52 virtual void DestroyDefaultView() OVERRIDE; 52 virtual void DestroyDefaultView() OVERRIDE;
53 virtual void DestroyNotificationView() OVERRIDE; 53 virtual void DestroyNotificationView() OVERRIDE;
54 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 54 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
55 virtual void UpdateAfterShelfAlignmentChange(
56 ShelfAlignment alignment) OVERRIDE;
55 57
56 // Overridden from PowerStatusObserver. 58 // Overridden from PowerStatusObserver.
57 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE; 59 virtual void OnPowerStatusChanged(const PowerSupplyStatus& status) OVERRIDE;
58 60
59 // Sets |notification_state_|. Returns true if a notification should be shown. 61 // Sets |notification_state_|. Returns true if a notification should be shown.
60 bool UpdateNotificationState(const PowerSupplyStatus& status); 62 bool UpdateNotificationState(const PowerSupplyStatus& status);
61 63
62 tray::PowerTrayView* power_tray_; 64 tray::PowerTrayView* power_tray_;
63 tray::PowerNotificationView* notification_view_; 65 tray::PowerNotificationView* notification_view_;
64 NotificationState notification_state_; 66 NotificationState notification_state_;
65 67
66 DISALLOW_COPY_AND_ASSIGN(TrayPower); 68 DISALLOW_COPY_AND_ASSIGN(TrayPower);
67 }; 69 };
68 70
69 } // namespace internal 71 } // namespace internal
70 } // namespace ash 72 } // namespace ash
71 73
72 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_ 74 #endif // ASH_SYSTEM_POWER_TRAY_POWER_H_
OLDNEW
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/power/tray_power.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698