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

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

Issue 2148573002: Add palette tray to ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-tool-structure
Patch Set: Nits Created 4 years, 4 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
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_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 ImeMenuTray;
24 class LogoutButtonTray; 24 class LogoutButtonTray;
25 class PaletteTray;
25 class VirtualKeyboardTray; 26 class VirtualKeyboardTray;
26 #endif 27 #endif
27 28
28 class ASH_EXPORT StatusAreaWidget : public views::Widget { 29 class ASH_EXPORT StatusAreaWidget : public views::Widget {
29 public: 30 public:
30 StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf); 31 StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf);
31 ~StatusAreaWidget() override; 32 ~StatusAreaWidget() override;
32 33
33 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray. 34 // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
34 void CreateTrayViews(); 35 void CreateTrayViews();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // Overridden from views::Widget: 73 // Overridden from views::Widget:
73 void OnNativeWidgetActivationChanged(bool active) override; 74 void OnNativeWidgetActivationChanged(bool active) override;
74 void OnMouseEvent(ui::MouseEvent* event) override; 75 void OnMouseEvent(ui::MouseEvent* event) override;
75 void OnGestureEvent(ui::GestureEvent* event) override; 76 void OnGestureEvent(ui::GestureEvent* event) override;
76 77
77 private: 78 private:
78 void AddSystemTray(); 79 void AddSystemTray();
79 void AddWebNotificationTray(); 80 void AddWebNotificationTray();
80 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
81 void AddLogoutButtonTray(); 82 void AddLogoutButtonTray();
83 void AddPaletteTray();
82 void AddVirtualKeyboardTray(); 84 void AddVirtualKeyboardTray();
83 void AddImeMenuTray(); 85 void AddImeMenuTray();
84 #endif 86 #endif
85 void AddOverviewButtonTray(); 87 void AddOverviewButtonTray();
86 88
87 // Weak pointers to View classes that are parented to StatusAreaWidget: 89 // Weak pointers to View classes that are parented to StatusAreaWidget:
88 StatusAreaWidgetDelegate* status_area_widget_delegate_; 90 StatusAreaWidgetDelegate* status_area_widget_delegate_;
89 OverviewButtonTray* overview_button_tray_; 91 OverviewButtonTray* overview_button_tray_;
90 SystemTray* system_tray_; 92 SystemTray* system_tray_;
91 WebNotificationTray* web_notification_tray_; 93 WebNotificationTray* web_notification_tray_;
92 #if defined(OS_CHROMEOS) 94 #if defined(OS_CHROMEOS)
93 LogoutButtonTray* logout_button_tray_; 95 LogoutButtonTray* logout_button_tray_;
96 PaletteTray* palette_tray_;
94 VirtualKeyboardTray* virtual_keyboard_tray_; 97 VirtualKeyboardTray* virtual_keyboard_tray_;
95 ImeMenuTray* ime_menu_tray_; 98 ImeMenuTray* ime_menu_tray_;
96 #endif 99 #endif
97 LoginStatus login_status_; 100 LoginStatus login_status_;
98 101
99 WmShelf* wm_shelf_; 102 WmShelf* wm_shelf_;
100 103
101 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 104 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
102 }; 105 };
103 106
104 } // namespace ash 107 } // namespace ash
105 108
106 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 109 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698