| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // Closes system bubble and returns true if it did exist. | 123 // Closes system bubble and returns true if it did exist. |
| 124 bool CloseSystemBubble() const; | 124 bool CloseSystemBubble() const; |
| 125 | 125 |
| 126 // Returns view for help button if default view is shown. Returns NULL | 126 // Returns view for help button if default view is shown. Returns NULL |
| 127 // otherwise. | 127 // otherwise. |
| 128 views::View* GetHelpButtonView() const; | 128 views::View* GetHelpButtonView() const; |
| 129 | 129 |
| 130 // Returns TrayAudio object if present or null otherwise. | 130 // Returns TrayAudio object if present or null otherwise. |
| 131 TrayAudio* GetTrayAudio() const; | 131 TrayAudio* GetTrayAudio() const; |
| 132 | 132 |
| 133 // Accessors for testing. | |
| 134 | |
| 135 // Returns true if the bubble exists. | |
| 136 bool CloseNotificationBubbleForTest() const; | |
| 137 | |
| 138 // Overridden from TrayBackgroundView. | 133 // Overridden from TrayBackgroundView. |
| 139 void SetShelfAlignment(ShelfAlignment alignment) override; | 134 void SetShelfAlignment(ShelfAlignment alignment) override; |
| 140 void AnchorUpdated() override; | 135 void AnchorUpdated() override; |
| 141 base::string16 GetAccessibleNameForTray() override; | 136 base::string16 GetAccessibleNameForTray() override; |
| 142 void BubbleResized(const views::TrayBubbleView* bubble_view) override; | 137 void BubbleResized(const views::TrayBubbleView* bubble_view) override; |
| 143 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 138 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 144 void ClickedOutsideBubble() override; | 139 void ClickedOutsideBubble() override; |
| 145 | 140 |
| 146 // views::TrayBubbleView::Delegate: | 141 // views::TrayBubbleView::Delegate: |
| 147 void BubbleViewDestroyed() override; | 142 void BubbleViewDestroyed() override; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 std::unique_ptr<KeyEventWatcher> key_event_watcher_; | 277 std::unique_ptr<KeyEventWatcher> key_event_watcher_; |
| 283 | 278 |
| 284 std::unique_ptr<ActivationObserver> activation_observer_; | 279 std::unique_ptr<ActivationObserver> activation_observer_; |
| 285 | 280 |
| 286 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 281 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 287 }; | 282 }; |
| 288 | 283 |
| 289 } // namespace ash | 284 } // namespace ash |
| 290 | 285 |
| 291 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 286 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |