| 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_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 void HideMessageCenter() override; | 115 void HideMessageCenter() override; |
| 116 bool ShowPopups() override; | 116 bool ShowPopups() override; |
| 117 void HidePopups() override; | 117 void HidePopups() override; |
| 118 bool ShowNotifierSettings() override; | 118 bool ShowNotifierSettings() override; |
| 119 bool IsContextMenuEnabled() const override; | 119 bool IsContextMenuEnabled() const override; |
| 120 message_center::MessageCenterTray* GetMessageCenterTray() override; | 120 message_center::MessageCenterTray* GetMessageCenterTray() override; |
| 121 | 121 |
| 122 // Overridden from SimpleMenuModel::Delegate. | 122 // Overridden from SimpleMenuModel::Delegate. |
| 123 bool IsCommandIdChecked(int command_id) const override; | 123 bool IsCommandIdChecked(int command_id) const override; |
| 124 bool IsCommandIdEnabled(int command_id) const override; | 124 bool IsCommandIdEnabled(int command_id) const override; |
| 125 bool GetAcceleratorForCommandId(int command_id, | |
| 126 ui::Accelerator* accelerator) const override; | |
| 127 void ExecuteCommand(int command_id, int event_flags) override; | 125 void ExecuteCommand(int command_id, int event_flags) override; |
| 128 | 126 |
| 129 message_center::MessageCenter* message_center() const; | 127 message_center::MessageCenter* message_center() const; |
| 130 | 128 |
| 131 private: | 129 private: |
| 132 friend class WebNotificationTrayTest; | 130 friend class WebNotificationTrayTest; |
| 133 | 131 |
| 134 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); | 132 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); |
| 135 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); | 133 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); |
| 136 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, | 134 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 bool should_block_shelf_auto_hide_; | 188 bool should_block_shelf_auto_hide_; |
| 191 | 189 |
| 192 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; | 190 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; |
| 193 | 191 |
| 194 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); | 192 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); |
| 195 }; | 193 }; |
| 196 | 194 |
| 197 } // namespace ash | 195 } // namespace ash |
| 198 | 196 |
| 199 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 197 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| OLD | NEW |