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_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 28 matching lines...) Expand all Loading... | |
| 39 class SmsObserver; | 39 class SmsObserver; |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 class SystemTrayItem; | 42 class SystemTrayItem; |
| 43 | 43 |
| 44 namespace internal { | 44 namespace internal { |
| 45 class SystemBubbleWrapper; | 45 class SystemBubbleWrapper; |
| 46 class SystemTrayContainer; | 46 class SystemTrayContainer; |
| 47 class TrayAccessibility; | 47 class TrayAccessibility; |
| 48 class TrayGestureHandler; | 48 class TrayGestureHandler; |
| 49 class TrayTracing; | |
|
sadrul
2013/08/09 04:56:44
Not necessary here.
Zachary Kuznia
2013/08/09 20:58:04
Done.
| |
| 49 } | 50 } |
| 50 | 51 |
| 51 // There are different methods for creating bubble views. | 52 // There are different methods for creating bubble views. |
| 52 enum BubbleCreationType { | 53 enum BubbleCreationType { |
| 53 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. | 54 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. |
| 54 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. | 55 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. |
| 55 }; | 56 }; |
| 56 | 57 |
| 57 class ASH_EXPORT SystemTray : public internal::TrayBackgroundView, | 58 class ASH_EXPORT SystemTray : public internal::TrayBackgroundView, |
| 58 public views::TrayBubbleView::Delegate { | 59 public views::TrayBubbleView::Delegate { |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 230 bool full_system_tray_menu_; | 231 bool full_system_tray_menu_; |
| 231 | 232 |
| 232 internal::TrayAccessibility* tray_accessibility_; // not owned | 233 internal::TrayAccessibility* tray_accessibility_; // not owned |
| 233 | 234 |
| 234 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 235 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 235 }; | 236 }; |
| 236 | 237 |
| 237 } // namespace ash | 238 } // namespace ash |
| 238 | 239 |
| 239 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 240 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |