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

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

Issue 2895843002: chromeos: Eliminate WmWindow from //ash/system (Closed)
Patch Set: comments 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/palette/palette_utils.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 {
16 class Window;
17 }
18
15 namespace ash { 19 namespace ash {
16 class ImeMenuTray; 20 class ImeMenuTray;
17 class LockScreenActionTray; 21 class LockScreenActionTray;
18 class LogoutButtonTray; 22 class LogoutButtonTray;
19 class OverviewButtonTray; 23 class OverviewButtonTray;
20 class PaletteTray; 24 class PaletteTray;
21 class StatusAreaWidgetDelegate; 25 class StatusAreaWidgetDelegate;
22 class SystemTray; 26 class SystemTray;
23 class VirtualKeyboardTray; 27 class VirtualKeyboardTray;
24 class WebNotificationTray; 28 class WebNotificationTray;
25 class WmShelf; 29 class WmShelf;
26 class WmWindow;
27 30
28 class ASH_EXPORT StatusAreaWidget : public views::Widget, 31 class ASH_EXPORT StatusAreaWidget : public views::Widget,
29 public ShelfBackgroundAnimatorObserver { 32 public ShelfBackgroundAnimatorObserver {
30 public: 33 public:
31 StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf); 34 StatusAreaWidget(aura::Window* status_container, WmShelf* wm_shelf);
32 ~StatusAreaWidget() override; 35 ~StatusAreaWidget() override;
33 36
34 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. 37 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
35 void CreateTrayViews(); 38 void CreateTrayViews();
36 39
37 // Destroys the system tray and web notification tray. Called before 40 // Destroys the system tray and web notification tray. Called before
38 // tearing down the windows to avoid shutdown ordering issues. 41 // tearing down the windows to avoid shutdown ordering issues.
39 void Shutdown(); 42 void Shutdown();
40 43
41 // Update the alignment of the widget and tray views. 44 // Update the alignment of the widget and tray views.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 LoginStatus login_status_; 120 LoginStatus login_status_;
118 121
119 WmShelf* wm_shelf_; 122 WmShelf* wm_shelf_;
120 123
121 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 124 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
122 }; 125 };
123 126
124 } // namespace ash 127 } // namespace ash
125 128
126 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ 129 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/system/palette/palette_utils.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698