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

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

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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/brightness/tray_brightness.cc ('k') | 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/shelf/shelf_types.h" 9 #include "ash/shelf/shelf_types.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 internal::StatusAreaWidgetDelegate* status_area_widget_delegate() { 49 internal::StatusAreaWidgetDelegate* status_area_widget_delegate() {
50 return status_area_widget_delegate_; 50 return status_area_widget_delegate_;
51 } 51 }
52 SystemTray* system_tray() { return system_tray_; } 52 SystemTray* system_tray() { return system_tray_; }
53 WebNotificationTray* web_notification_tray() { 53 WebNotificationTray* web_notification_tray() {
54 return web_notification_tray_; 54 return web_notification_tray_;
55 } 55 }
56 56
57 user::LoginStatus login_status() const { return login_status_; } 57 user::LoginStatus login_status() const { return login_status_; }
58 58
59 // Returns true if the launcher should be visible. This is used when the 59 // Returns true if the shelf should be visible. This is used when the
60 // launcher is configured to auto-hide and test if the shelf should force 60 // shelf is configured to auto-hide and test if the shelf should force
61 // the launcher to remain visible. 61 // the shelf to remain visible.
62 bool ShouldShowLauncher() const; 62 bool ShouldShowShelf() const;
63 63
64 // True if any message bubble is shown. 64 // True if any message bubble is shown.
65 bool IsMessageBubbleShown() const; 65 bool IsMessageBubbleShown() const;
66 66
67 // Overridden from views::Widget: 67 // Overridden from views::Widget:
68 virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; 68 virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE;
69 69
70 private: 70 private:
71 void AddSystemTray(); 71 void AddSystemTray();
72 void AddWebNotificationTray(); 72 void AddWebNotificationTray();
73 void AddLogoutButtonTray(); 73 void AddLogoutButtonTray();
74 74
75 // Weak pointers to View classes that are parented to StatusAreaWidget: 75 // Weak pointers to View classes that are parented to StatusAreaWidget:
76 internal::StatusAreaWidgetDelegate* status_area_widget_delegate_; 76 internal::StatusAreaWidgetDelegate* status_area_widget_delegate_;
77 SystemTray* system_tray_; 77 SystemTray* system_tray_;
78 WebNotificationTray* web_notification_tray_; 78 WebNotificationTray* web_notification_tray_;
79 LogoutButtonTray* logout_button_tray_; 79 LogoutButtonTray* logout_button_tray_;
80 user::LoginStatus login_status_; 80 user::LoginStatus login_status_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 82 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
83 }; 83 };
84 84
85 } // namespace internal 85 } // namespace internal
86 } // namespace ash 86 } // namespace ash
87 87
88 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 88 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698