| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 virtual void ButtonPressed(views::Button* sender, | 98 virtual void ButtonPressed(views::Button* sender, |
| 99 const ui::Event& event) OVERRIDE; | 99 const ui::Event& event) OVERRIDE; |
| 100 | 100 |
| 101 // Overridden from MessageCenterTrayDelegate. | 101 // Overridden from MessageCenterTrayDelegate. |
| 102 virtual void OnMessageCenterTrayChanged() OVERRIDE; | 102 virtual void OnMessageCenterTrayChanged() OVERRIDE; |
| 103 virtual bool ShowMessageCenter() OVERRIDE; | 103 virtual bool ShowMessageCenter() OVERRIDE; |
| 104 virtual void HideMessageCenter() OVERRIDE; | 104 virtual void HideMessageCenter() OVERRIDE; |
| 105 virtual bool ShowPopups() OVERRIDE; | 105 virtual bool ShowPopups() OVERRIDE; |
| 106 virtual void HidePopups() OVERRIDE; | 106 virtual void HidePopups() OVERRIDE; |
| 107 virtual bool ShowNotifierSettings() OVERRIDE; | 107 virtual bool ShowNotifierSettings() OVERRIDE; |
| 108 virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE; |
| 108 | 109 |
| 109 // Overridden from TrayBackgroundView. | 110 // Overridden from TrayBackgroundView. |
| 110 virtual bool IsPressed() OVERRIDE; | 111 virtual bool IsPressed() OVERRIDE; |
| 111 | 112 |
| 112 message_center::MessageCenter* message_center(); | 113 message_center::MessageCenter* message_center(); |
| 113 | 114 |
| 114 private: | 115 private: |
| 115 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); | 116 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); |
| 116 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); | 117 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); |
| 117 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, | 118 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 // the check can be called when creating this object, so it would cause | 159 // the check can be called when creating this object, so it would cause |
| 159 // flickers of the shelf from hidden to shown. See: crbug.com/181213 | 160 // flickers of the shelf from hidden to shown. See: crbug.com/181213 |
| 160 bool should_block_shelf_auto_hide_; | 161 bool should_block_shelf_auto_hide_; |
| 161 | 162 |
| 162 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); | 163 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); |
| 163 }; | 164 }; |
| 164 | 165 |
| 165 } // namespace ash | 166 } // namespace ash |
| 166 | 167 |
| 167 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 168 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| OLD | NEW |