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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 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
« no previous file with comments | « ash/system/session/logout_button_tray.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/login_status.h" 9 #include "ash/login_status.h"
10 #include "ash/public/cpp/shelf_types.h" 10 #include "ash/public/cpp/shelf_types.h"
11 #include "ash/shelf/shelf_background_animator_observer.h" 11 #include "ash/shelf/shelf_background_animator_observer.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 14
15 namespace aura { 15 namespace aura {
16 class Window; 16 class Window;
17 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 class ImeMenuTray; 20 class ImeMenuTray;
21 class LockScreenActionTray; 21 class LockScreenActionTray;
22 class LogoutButtonTray; 22 class LogoutButtonTray;
23 class OverviewButtonTray; 23 class OverviewButtonTray;
24 class PaletteTray; 24 class PaletteTray;
25 class Shelf;
25 class StatusAreaWidgetDelegate; 26 class StatusAreaWidgetDelegate;
26 class SystemTray; 27 class SystemTray;
27 class VirtualKeyboardTray; 28 class VirtualKeyboardTray;
28 class WebNotificationTray; 29 class WebNotificationTray;
29 class WmShelf;
30 30
31 class ASH_EXPORT StatusAreaWidget : public views::Widget, 31 class ASH_EXPORT StatusAreaWidget : public views::Widget,
32 public ShelfBackgroundAnimatorObserver { 32 public ShelfBackgroundAnimatorObserver {
33 public: 33 public:
34 StatusAreaWidget(aura::Window* status_container, WmShelf* wm_shelf); 34 StatusAreaWidget(aura::Window* status_container, Shelf* shelf);
35 ~StatusAreaWidget() override; 35 ~StatusAreaWidget() override;
36 36
37 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. 37 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
38 void CreateTrayViews(); 38 void CreateTrayViews();
39 39
40 // Destroys the system tray and web notification tray. Called before 40 // Destroys the system tray and web notification tray. Called before
41 // tearing down the windows to avoid shutdown ordering issues. 41 // tearing down the windows to avoid shutdown ordering issues.
42 void Shutdown(); 42 void Shutdown();
43 43
44 // Update the alignment of the widget and tray views. 44 // Update the alignment of the widget and tray views.
(...skipping 10 matching lines...) Expand all
55 SystemTray* system_tray() { return system_tray_; } 55 SystemTray* system_tray() { return system_tray_; }
56 WebNotificationTray* web_notification_tray() { 56 WebNotificationTray* web_notification_tray() {
57 return web_notification_tray_; 57 return web_notification_tray_;
58 } 58 }
59 OverviewButtonTray* overview_button_tray() { return overview_button_tray_; } 59 OverviewButtonTray* overview_button_tray() { return overview_button_tray_; }
60 60
61 PaletteTray* palette_tray() { return palette_tray_; } 61 PaletteTray* palette_tray() { return palette_tray_; }
62 62
63 ImeMenuTray* ime_menu_tray() { return ime_menu_tray_; } 63 ImeMenuTray* ime_menu_tray() { return ime_menu_tray_; }
64 64
65 WmShelf* wm_shelf() { return wm_shelf_; } 65 Shelf* shelf() { return shelf_; }
66 66
67 LoginStatus login_status() const { return login_status_; } 67 LoginStatus login_status() const { return login_status_; }
68 68
69 // Returns true if the shelf should be visible. This is used when the 69 // Returns true if the shelf should be visible. This is used when the
70 // shelf is configured to auto-hide and test if the shelf should force 70 // shelf is configured to auto-hide and test if the shelf should force
71 // the shelf to remain visible. 71 // the shelf to remain visible.
72 bool ShouldShowShelf() const; 72 bool ShouldShowShelf() const;
73 73
74 // True if any message bubble is shown. 74 // True if any message bubble is shown.
75 bool IsMessageBubbleShown() const; 75 bool IsMessageBubbleShown() const;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 OverviewButtonTray* overview_button_tray_; 112 OverviewButtonTray* overview_button_tray_;
113 SystemTray* system_tray_; 113 SystemTray* system_tray_;
114 WebNotificationTray* web_notification_tray_; 114 WebNotificationTray* web_notification_tray_;
115 LockScreenActionTray* lock_screen_action_tray_; 115 LockScreenActionTray* lock_screen_action_tray_;
116 LogoutButtonTray* logout_button_tray_; 116 LogoutButtonTray* logout_button_tray_;
117 PaletteTray* palette_tray_; 117 PaletteTray* palette_tray_;
118 VirtualKeyboardTray* virtual_keyboard_tray_; 118 VirtualKeyboardTray* virtual_keyboard_tray_;
119 ImeMenuTray* ime_menu_tray_; 119 ImeMenuTray* ime_menu_tray_;
120 LoginStatus login_status_; 120 LoginStatus login_status_;
121 121
122 WmShelf* wm_shelf_; 122 Shelf* shelf_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 124 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
125 }; 125 };
126 126
127 } // namespace ash 127 } // namespace ash
128 128
129 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 129 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/system/session/logout_button_tray.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698