| 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_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 5 #ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ |
| 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/login_status.h" | 9 #include "ash/common/login_status.h" |
| 10 #include "ash/common/shelf/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.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 ShellDelegate; | 16 class ShellDelegate; |
| 17 class StatusAreaWidgetDelegate; | 17 class StatusAreaWidgetDelegate; |
| 18 class SystemTray; | 18 class SystemTray; |
| 19 class WebNotificationTray; | 19 class WebNotificationTray; |
| 20 class WmShelf; | 20 class WmShelf; |
| 21 class WmWindow; | 21 class WmWindow; |
| 22 #if defined(OS_CHROMEOS) | 22 #if defined(OS_CHROMEOS) |
| 23 class ImeMenuTray; |
| 23 class LogoutButtonTray; | 24 class LogoutButtonTray; |
| 24 class VirtualKeyboardTray; | 25 class VirtualKeyboardTray; |
| 25 #endif | 26 #endif |
| 26 | 27 |
| 27 class ASH_EXPORT StatusAreaWidget : public views::Widget { | 28 class ASH_EXPORT StatusAreaWidget : public views::Widget { |
| 28 public: | 29 public: |
| 29 StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf); | 30 StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf); |
| 30 ~StatusAreaWidget() override; | 31 ~StatusAreaWidget() override; |
| 31 | 32 |
| 32 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. | 33 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 void OnNativeWidgetActivationChanged(bool active) override; | 73 void OnNativeWidgetActivationChanged(bool active) override; |
| 73 void OnMouseEvent(ui::MouseEvent* event) override; | 74 void OnMouseEvent(ui::MouseEvent* event) override; |
| 74 void OnGestureEvent(ui::GestureEvent* event) override; | 75 void OnGestureEvent(ui::GestureEvent* event) override; |
| 75 | 76 |
| 76 private: | 77 private: |
| 77 void AddSystemTray(); | 78 void AddSystemTray(); |
| 78 void AddWebNotificationTray(); | 79 void AddWebNotificationTray(); |
| 79 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
| 80 void AddLogoutButtonTray(); | 81 void AddLogoutButtonTray(); |
| 81 void AddVirtualKeyboardTray(); | 82 void AddVirtualKeyboardTray(); |
| 83 void AddImeMenuTray(); |
| 82 #endif | 84 #endif |
| 83 void AddOverviewButtonTray(); | 85 void AddOverviewButtonTray(); |
| 84 | 86 |
| 85 // Weak pointers to View classes that are parented to StatusAreaWidget: | 87 // Weak pointers to View classes that are parented to StatusAreaWidget: |
| 86 StatusAreaWidgetDelegate* status_area_widget_delegate_; | 88 StatusAreaWidgetDelegate* status_area_widget_delegate_; |
| 87 OverviewButtonTray* overview_button_tray_; | 89 OverviewButtonTray* overview_button_tray_; |
| 88 SystemTray* system_tray_; | 90 SystemTray* system_tray_; |
| 89 WebNotificationTray* web_notification_tray_; | 91 WebNotificationTray* web_notification_tray_; |
| 90 #if defined(OS_CHROMEOS) | 92 #if defined(OS_CHROMEOS) |
| 91 LogoutButtonTray* logout_button_tray_; | 93 LogoutButtonTray* logout_button_tray_; |
| 92 VirtualKeyboardTray* virtual_keyboard_tray_; | 94 VirtualKeyboardTray* virtual_keyboard_tray_; |
| 95 ImeMenuTray* ime_menu_tray_; |
| 93 #endif | 96 #endif |
| 94 LoginStatus login_status_; | 97 LoginStatus login_status_; |
| 95 | 98 |
| 96 WmShelf* wm_shelf_; | 99 WmShelf* wm_shelf_; |
| 97 | 100 |
| 98 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 101 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
| 99 }; | 102 }; |
| 100 | 103 |
| 101 } // namespace ash | 104 } // namespace ash |
| 102 | 105 |
| 103 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ | 106 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ |
| OLD | NEW |