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/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" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 private: | 76 private: |
77 void AddSystemTray(); | 77 void AddSystemTray(); |
78 void AddWebNotificationTray(); | 78 void AddWebNotificationTray(); |
79 #if defined(OS_CHROMEOS) | 79 #if defined(OS_CHROMEOS) |
80 void AddLogoutButtonTray(); | 80 void AddLogoutButtonTray(); |
81 void AddVirtualKeyboardTray(); | 81 void AddVirtualKeyboardTray(); |
82 #endif | 82 #endif |
83 void AddOverviewButtonTray(); | 83 void AddOverviewButtonTray(); |
84 | 84 |
| 85 // Calculate the border insets for tray items (ex: notification, overview) for |
| 86 // both MD and non-MD. |
| 87 gfx::Insets CalculateBorderMD(ShelfAlignment alignment, bool is_on_edge); |
| 88 gfx::Insets CalculateBorderNonMD(ShelfAlignment alignment, bool is_overview); |
| 89 |
85 // Weak pointers to View classes that are parented to StatusAreaWidget: | 90 // Weak pointers to View classes that are parented to StatusAreaWidget: |
86 StatusAreaWidgetDelegate* status_area_widget_delegate_; | 91 StatusAreaWidgetDelegate* status_area_widget_delegate_; |
87 OverviewButtonTray* overview_button_tray_; | 92 OverviewButtonTray* overview_button_tray_; |
88 SystemTray* system_tray_; | 93 SystemTray* system_tray_; |
89 WebNotificationTray* web_notification_tray_; | 94 WebNotificationTray* web_notification_tray_; |
90 #if defined(OS_CHROMEOS) | 95 #if defined(OS_CHROMEOS) |
91 LogoutButtonTray* logout_button_tray_; | 96 LogoutButtonTray* logout_button_tray_; |
92 VirtualKeyboardTray* virtual_keyboard_tray_; | 97 VirtualKeyboardTray* virtual_keyboard_tray_; |
93 #endif | 98 #endif |
94 LoginStatus login_status_; | 99 LoginStatus login_status_; |
95 | 100 |
96 WmShelf* wm_shelf_; | 101 WmShelf* wm_shelf_; |
97 | 102 |
98 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 103 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
99 }; | 104 }; |
100 | 105 |
101 } // namespace ash | 106 } // namespace ash |
102 | 107 |
103 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 108 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
OLD | NEW |