| 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_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 5 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| 6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/system/tray/tray_background_view.h" | 9 #include "ash/system/tray/tray_background_view.h" |
| 10 #include "ash/system/user/login_status.h" | 10 #include "ash/system/user/login_status.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE; | 112 virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE; |
| 113 | 113 |
| 114 // Overridden from SimpleMenuModel::Delegate. | 114 // Overridden from SimpleMenuModel::Delegate. |
| 115 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; | 115 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |
| 116 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; | 116 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; |
| 117 virtual bool GetAcceleratorForCommandId( | 117 virtual bool GetAcceleratorForCommandId( |
| 118 int command_id, | 118 int command_id, |
| 119 ui::Accelerator* accelerator) OVERRIDE; | 119 ui::Accelerator* accelerator) OVERRIDE; |
| 120 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; | 120 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; |
| 121 | 121 |
| 122 // Overridden from TrayBackgroundView. | |
| 123 virtual bool IsPressed() OVERRIDE; | |
| 124 | |
| 125 message_center::MessageCenter* message_center() const; | 122 message_center::MessageCenter* message_center() const; |
| 126 | 123 |
| 127 private: | 124 private: |
| 128 friend class WebNotificationTrayTest; | 125 friend class WebNotificationTrayTest; |
| 129 | 126 |
| 130 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); | 127 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); |
| 131 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); | 128 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); |
| 132 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, | 129 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, |
| 133 ManyMessageCenterNotifications); | 130 ManyMessageCenterNotifications); |
| 134 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications); | 131 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 178 |
| 182 // Observes the work area for |popup_collection_| and notifies to it. | 179 // Observes the work area for |popup_collection_| and notifies to it. |
| 183 scoped_ptr<internal::WorkAreaObserver> work_area_observer_; | 180 scoped_ptr<internal::WorkAreaObserver> work_area_observer_; |
| 184 | 181 |
| 185 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); | 182 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); |
| 186 }; | 183 }; |
| 187 | 184 |
| 188 } // namespace ash | 185 } // namespace ash |
| 189 | 186 |
| 190 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 187 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| OLD | NEW |