| 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_TRAY_SYSTEM_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 | 205 |
| 206 // Deactivate the system tray in the shelf if it was active before. | 206 // Deactivate the system tray in the shelf if it was active before. |
| 207 void CloseSystemBubbleAndDeactivateSystemTray(); | 207 void CloseSystemBubbleAndDeactivateSystemTray(); |
| 208 | 208 |
| 209 // Records UMA metrics for the number of user-visible rows in the system menu | 209 // Records UMA metrics for the number of user-visible rows in the system menu |
| 210 // and the percentage of the work area height covered by the system menu. | 210 // and the percentage of the work area height covered by the system menu. |
| 211 void RecordSystemMenuMetrics(); | 211 void RecordSystemMenuMetrics(); |
| 212 | 212 |
| 213 const ScopedVector<SystemTrayItem>& items() const { return items_; } | 213 const ScopedVector<SystemTrayItem>& items() const { return items_; } |
| 214 | 214 |
| 215 // Additional padding are used to adjust the user-visible size of status tray |
| 216 // dark background in non-MD. |
| 217 void AdjustStatusTrayBackground(); |
| 218 |
| 215 // Overridden from ActionableView. | 219 // Overridden from ActionableView. |
| 216 bool PerformAction(const ui::Event& event) override; | 220 bool PerformAction(const ui::Event& event) override; |
| 217 | 221 |
| 218 // The web notification tray view that appears adjacent to this view. | 222 // The web notification tray view that appears adjacent to this view. |
| 219 WebNotificationTray* web_notification_tray_; | 223 WebNotificationTray* web_notification_tray_; |
| 220 | 224 |
| 221 // Owned items. | 225 // Owned items. |
| 222 ScopedVector<SystemTrayItem> items_; | 226 ScopedVector<SystemTrayItem> items_; |
| 223 | 227 |
| 224 // Pointers to members of |items_|. | 228 // Pointers to members of |items_|. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 255 // A reference to the Screen share and capture item. | 259 // A reference to the Screen share and capture item. |
| 256 ScreenTrayItem* screen_capture_tray_item_; // not owned | 260 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 257 ScreenTrayItem* screen_share_tray_item_; // not owned | 261 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 258 | 262 |
| 259 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 263 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 260 }; | 264 }; |
| 261 | 265 |
| 262 } // namespace ash | 266 } // namespace ash |
| 263 | 267 |
| 264 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 268 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |