| 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_TRAY_SYSTEM_TRAY_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 // Get the tray item view (or NULL) for a given |tray_item| in a unit test. | 151 // Get the tray item view (or NULL) for a given |tray_item| in a unit test. |
| 152 views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item); | 152 views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item); |
| 153 | 153 |
| 154 // Gets tray_cast_ for browser tests. | 154 // Gets tray_cast_ for browser tests. |
| 155 TrayCast* GetTrayCastForTesting() const; | 155 TrayCast* GetTrayCastForTesting() const; |
| 156 | 156 |
| 157 // Gets tray_date_ for browser tests. | 157 // Gets tray_date_ for browser tests. |
| 158 TrayDate* GetTrayDateForTesting() const; | 158 TrayDate* GetTrayDateForTesting() const; |
| 159 | 159 |
| 160 void GetHitRegionInsets(gfx::Insets& insets) override; |
| 161 |
| 160 private: | 162 private: |
| 161 // Creates the default set of items for the sytem tray. | 163 // Creates the default set of items for the sytem tray. |
| 162 void CreateItems(SystemTrayDelegate* delegate); | 164 void CreateItems(SystemTrayDelegate* delegate); |
| 163 | 165 |
| 164 // Resets |system_bubble_| and clears any related state. | 166 // Resets |system_bubble_| and clears any related state. |
| 165 void DestroySystemBubble(); | 167 void DestroySystemBubble(); |
| 166 | 168 |
| 167 // Resets |notification_bubble_| and clears any related state. | 169 // Resets |notification_bubble_| and clears any related state. |
| 168 void DestroyNotificationBubble(); | 170 void DestroyNotificationBubble(); |
| 169 | 171 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 // A reference to the Screen share and capture item. | 248 // A reference to the Screen share and capture item. |
| 247 ScreenTrayItem* screen_capture_tray_item_; // not owned | 249 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 248 ScreenTrayItem* screen_share_tray_item_; // not owned | 250 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 249 | 251 |
| 250 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 252 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 251 }; | 253 }; |
| 252 | 254 |
| 253 } // namespace ash | 255 } // namespace ash |
| 254 | 256 |
| 255 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 257 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |