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

Side by Side Diff: ash/system/status_area_widget.h

Issue 10830190: Fix status area tray spacing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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 | « no previous file | ash/system/status_area_widget.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_STATUS_AREA_WIDGET_H_ 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_
6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/launcher/background_animator.h" 9 #include "ash/launcher/background_animator.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void SetHideSystemNotifications(bool hide); 49 void SetHideSystemNotifications(bool hide);
50 50
51 // Returns true if it is OK to show a non system notification. 51 // Returns true if it is OK to show a non system notification.
52 bool ShouldShowNonSystemNotifications(); 52 bool ShouldShowNonSystemNotifications();
53 53
54 // Called by the client when the login status changes. Caches login_status 54 // Called by the client when the login status changes. Caches login_status
55 // and calls UpdateAfterLoginStatusChange for the system tray and the web 55 // and calls UpdateAfterLoginStatusChange for the system tray and the web
56 // notification tray. 56 // notification tray.
57 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 57 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
58 58
59 internal::StatusAreaWidgetDelegate* status_area_widget_delegate() {
60 return status_area_widget_delegate_;
61 }
59 SystemTray* system_tray() { return system_tray_; } 62 SystemTray* system_tray() { return system_tray_; }
60 SystemTrayDelegate* system_tray_delegate() { 63 SystemTrayDelegate* system_tray_delegate() {
61 return system_tray_delegate_.get(); 64 return system_tray_delegate_.get();
62 } 65 }
63 WebNotificationTray* web_notification_tray() { 66 WebNotificationTray* web_notification_tray() {
64 return web_notification_tray_; 67 return web_notification_tray_;
65 } 68 }
66 69
67 user::LoginStatus login_status() const { return login_status_; } 70 user::LoginStatus login_status() const { return login_status_; }
68 71
69 private: 72 private:
70 void AddSystemTray(SystemTray* system_tray, ShellDelegate* shell_delegate); 73 void AddSystemTray(ShellDelegate* shell_delegate);
71 void AddWebNotificationTray(WebNotificationTray* web_notification_tray); 74 void AddWebNotificationTray();
72 75
73 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 76 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
74 // Weak pointers to View classes that are parented to StatusAreaWidget: 77 // Weak pointers to View classes that are parented to StatusAreaWidget:
75 internal::StatusAreaWidgetDelegate* widget_delegate_; 78 internal::StatusAreaWidgetDelegate* status_area_widget_delegate_;
76 SystemTray* system_tray_; 79 SystemTray* system_tray_;
77 WebNotificationTray* web_notification_tray_; 80 WebNotificationTray* web_notification_tray_;
78 user::LoginStatus login_status_; 81 user::LoginStatus login_status_;
79 82
80 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 83 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
81 }; 84 };
82 85
83 } // namespace internal 86 } // namespace internal
84 } // namespace ash 87 } // namespace ash
85 88
86 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 89 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698