Chromium Code Reviews| 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 trays (ex: notification, overview) for both | |
|
tdanderson
2016/06/29 17:46:19
nit: "non-MD"
nit: "for tray items" instead of "f
yiyix
2016/06/29 18:56:39
Done.
| |
| 86 // MD and no-MD. | |
| 87 void CalculateBorderMD(gfx::Insets* insets, | |
| 88 ShelfAlignment alignment, | |
| 89 bool is_on_edge); | |
| 90 void CalculateBorderNonMD(gfx::Insets* insets, | |
| 91 ShelfAlignment alignment, | |
| 92 bool is_overview); | |
| 93 | |
| 85 // Weak pointers to View classes that are parented to StatusAreaWidget: | 94 // Weak pointers to View classes that are parented to StatusAreaWidget: |
| 86 StatusAreaWidgetDelegate* status_area_widget_delegate_; | 95 StatusAreaWidgetDelegate* status_area_widget_delegate_; |
| 87 OverviewButtonTray* overview_button_tray_; | 96 OverviewButtonTray* overview_button_tray_; |
| 88 SystemTray* system_tray_; | 97 SystemTray* system_tray_; |
| 89 WebNotificationTray* web_notification_tray_; | 98 WebNotificationTray* web_notification_tray_; |
| 90 #if defined(OS_CHROMEOS) | 99 #if defined(OS_CHROMEOS) |
| 91 LogoutButtonTray* logout_button_tray_; | 100 LogoutButtonTray* logout_button_tray_; |
| 92 VirtualKeyboardTray* virtual_keyboard_tray_; | 101 VirtualKeyboardTray* virtual_keyboard_tray_; |
| 93 #endif | 102 #endif |
| 94 LoginStatus login_status_; | 103 LoginStatus login_status_; |
| 95 | 104 |
| 96 WmShelf* wm_shelf_; | 105 WmShelf* wm_shelf_; |
| 97 | 106 |
| 98 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); | 107 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); |
| 99 }; | 108 }; |
| 100 | 109 |
| 101 } // namespace ash | 110 } // namespace ash |
| 102 | 111 |
| 103 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ | 112 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_ |
| OLD | NEW |