| OLD | NEW |
| 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" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 class OverviewButtonTray; | 15 class OverviewButtonTray; |
| 16 class ShelfWidget; | 16 class ShelfWidget; |
| 17 class ShellDelegate; | 17 class ShellDelegate; |
| 18 class StatusAreaWidgetDelegate; | 18 class StatusAreaWidgetDelegate; |
| 19 class SystemTray; | 19 class SystemTray; |
| 20 class WebNotificationTray; | 20 class WebNotificationTray; |
| 21 #if defined(OS_CHROMEOS) | 21 #if defined(OS_CHROMEOS) |
| 22 class LogoutButtonTray; | 22 class LogoutButtonTray; |
| 23 class VirtualKeyboardTray; | 23 class VirtualKeyboardTray; |
| 24 #endif | 24 #endif |
| 25 namespace wm { |
| 26 class WmWindow; |
| 27 } |
| 25 | 28 |
| 26 class ASH_EXPORT StatusAreaWidget : public views::Widget { | 29 class ASH_EXPORT StatusAreaWidget : public views::Widget { |
| 27 public: | 30 public: |
| 28 StatusAreaWidget(aura::Window* status_container, ShelfWidget* shelf_widget); | 31 StatusAreaWidget(wm::WmWindow* status_container, ShelfWidget* shelf_widget); |
| 29 ~StatusAreaWidget() override; | 32 ~StatusAreaWidget() override; |
| 30 | 33 |
| 31 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. | 34 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. |
| 32 void CreateTrayViews(); | 35 void CreateTrayViews(); |
| 33 | 36 |
| 34 // Destroys the system tray and web notification tray. Called before | 37 // Destroys the system tray and web notification tray. Called before |
| 35 // tearing down the windows to avoid shutdown ordering issues. | 38 // tearing down the windows to avoid shutdown ordering issues. |
| 36 void Shutdown(); | 39 void Shutdown(); |
| 37 | 40 |
| 38 // Update the alignment of the widget and tray views. | 41 // Update the alignment of the widget and tray views. |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 user::LoginStatus login_status_; | 101 user::LoginStatus login_status_; |
| 99 | 102 |
| 100 ShelfWidget* shelf_widget_; | 103 ShelfWidget* shelf_widget_; |
| 101 | 104 |
| 102 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 105 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
| 103 }; | 106 }; |
| 104 | 107 |
| 105 } // namespace ash | 108 } // namespace ash |
| 106 | 109 |
| 107 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 110 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
| OLD | NEW |