| 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 "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/system/tray/system_tray_bubble.h" | 9 #include "ash/system/tray/system_tray_bubble.h" |
| 10 #include "ash/system/tray/tray_background_view.h" | 10 #include "ash/system/tray/tray_background_view.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; | 149 virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; |
| 150 virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget, | 150 virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget, |
| 151 AnchorType anchor_type, | 151 AnchorType anchor_type, |
| 152 AnchorAlignment anchor_alignment) OVERRIDE; | 152 AnchorAlignment anchor_alignment) OVERRIDE; |
| 153 virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; | 153 virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; |
| 154 | 154 |
| 155 internal::TrayAccessibility* GetTrayAccessibilityForTest() { | 155 internal::TrayAccessibility* GetTrayAccessibilityForTest() { |
| 156 return tray_accessibility_; | 156 return tray_accessibility_; |
| 157 } | 157 } |
| 158 | 158 |
| 159 // Overridden from TrayBackgroundView. | |
| 160 virtual bool IsPressed() OVERRIDE; | |
| 161 | |
| 162 private: | 159 private: |
| 163 // Creates the default set of items for the sytem tray. | 160 // Creates the default set of items for the sytem tray. |
| 164 void CreateItems(SystemTrayDelegate* delegate); | 161 void CreateItems(SystemTrayDelegate* delegate); |
| 165 | 162 |
| 166 // Resets |system_bubble_| and clears any related state. | 163 // Resets |system_bubble_| and clears any related state. |
| 167 void DestroySystemBubble(); | 164 void DestroySystemBubble(); |
| 168 | 165 |
| 169 // Resets |notification_bubble_| and clears any related state. | 166 // Resets |notification_bubble_| and clears any related state. |
| 170 void DestroyNotificationBubble(); | 167 void DestroyNotificationBubble(); |
| 171 | 168 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 bool full_system_tray_menu_; | 226 bool full_system_tray_menu_; |
| 230 | 227 |
| 231 internal::TrayAccessibility* tray_accessibility_; // not owned | 228 internal::TrayAccessibility* tray_accessibility_; // not owned |
| 232 | 229 |
| 233 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 230 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 234 }; | 231 }; |
| 235 | 232 |
| 236 } // namespace ash | 233 } // namespace ash |
| 237 | 234 |
| 238 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 235 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |