| 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 | 210 |
| 211 // Deactivate the system tray in the shelf if it was active before. | 211 // Deactivate the system tray in the shelf if it was active before. |
| 212 void CloseSystemBubbleAndDeactivateSystemTray(); | 212 void CloseSystemBubbleAndDeactivateSystemTray(); |
| 213 | 213 |
| 214 // Records UMA metrics for the number of user-visible rows in the system menu | 214 // Records UMA metrics for the number of user-visible rows in the system menu |
| 215 // and the percentage of the work area height covered by the system menu. | 215 // and the percentage of the work area height covered by the system menu. |
| 216 void RecordSystemMenuMetrics(); | 216 void RecordSystemMenuMetrics(); |
| 217 | 217 |
| 218 const ScopedVector<SystemTrayItem>& items() const { return items_; } | 218 const ScopedVector<SystemTrayItem>& items() const { return items_; } |
| 219 | 219 |
| 220 // Sets an empty border around the system tray to change user-visible size |
| 221 // of the dark background. Doesn't do anything in MD. |
| 222 void AdjustStatusTrayBackground(); |
| 223 |
| 220 // Overridden from ActionableView. | 224 // Overridden from ActionableView. |
| 221 bool PerformAction(const ui::Event& event) override; | 225 bool PerformAction(const ui::Event& event) override; |
| 222 | 226 |
| 223 // The web notification tray view that appears adjacent to this view. | 227 // The web notification tray view that appears adjacent to this view. |
| 224 WebNotificationTray* web_notification_tray_; | 228 WebNotificationTray* web_notification_tray_; |
| 225 | 229 |
| 226 // Owned items. | 230 // Owned items. |
| 227 ScopedVector<SystemTrayItem> items_; | 231 ScopedVector<SystemTrayItem> items_; |
| 228 | 232 |
| 229 // Pointers to members of |items_|. | 233 // Pointers to members of |items_|. |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 // A reference to the Screen share and capture item. | 266 // A reference to the Screen share and capture item. |
| 263 ScreenTrayItem* screen_capture_tray_item_; // not owned | 267 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 264 ScreenTrayItem* screen_share_tray_item_; // not owned | 268 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 265 | 269 |
| 266 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 270 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 267 }; | 271 }; |
| 268 | 272 |
| 269 } // namespace ash | 273 } // namespace ash |
| 270 | 274 |
| 271 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 275 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |