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_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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 ui::MenuModel* CreateQuietModeMenu(); | 161 ui::MenuModel* CreateQuietModeMenu(); |
| 162 | 162 |
| 163 WebNotificationBubbleWrapper* message_center_bubble() const { | 163 WebNotificationBubbleWrapper* message_center_bubble() const { |
| 164 return message_center_bubble_.get(); | 164 return message_center_bubble_.get(); |
| 165 } | 165 } |
| 166 | 166 |
| 167 // Returns true if any user is logged in and the system is not at the screen | 167 // Returns true if any user is logged in and the system is not at the screen |
| 168 // for adding a secondary user. | 168 // for adding a secondary user. |
| 169 bool IsLoggedIn() const; | 169 bool IsLoggedIn() const; |
| 170 | 170 |
| 171 // views:View | |
| 172 void OnPaint(gfx::Canvas* canvas) override; | |
| 173 | |
|
varkha
2016/07/14 21:34:48
I think it would be better to make it protected be
yiyix
2016/07/26 20:27:32
N/A with new approach
| |
| 171 // Testing accessors. | 174 // Testing accessors. |
| 172 bool IsPopupVisible() const; | 175 bool IsPopupVisible() const; |
| 173 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); | 176 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); |
| 174 | 177 |
| 175 WmWindow* status_area_window_; | 178 WmWindow* status_area_window_; |
| 176 SystemTray* system_tray_; | 179 SystemTray* system_tray_; |
| 177 std::unique_ptr<message_center::MessageCenterTray> message_center_tray_; | 180 std::unique_ptr<message_center::MessageCenterTray> message_center_tray_; |
| 178 std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_; | 181 std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_; |
| 179 std::unique_ptr<message_center::MessagePopupCollection> popup_collection_; | 182 std::unique_ptr<message_center::MessagePopupCollection> popup_collection_; |
| 180 WebNotificationButton* button_; | 183 WebNotificationButton* button_; |
| 181 | 184 |
| 182 bool show_message_center_on_unlock_; | 185 bool show_message_center_on_unlock_; |
| 183 | 186 |
| 184 bool should_update_tray_content_; | 187 bool should_update_tray_content_; |
| 185 | 188 |
| 186 // True when the shelf auto hide behavior has to be blocked. Previously | 189 // True when the shelf auto hide behavior has to be blocked. Previously |
| 187 // this was done by checking |message_center_bubble_| but actually | 190 // this was done by checking |message_center_bubble_| but actually |
| 188 // the check can be called when creating this object, so it would cause | 191 // the check can be called when creating this object, so it would cause |
| 189 // flickers of the shelf from hidden to shown. See: crbug.com/181213 | 192 // flickers of the shelf from hidden to shown. See: crbug.com/181213 |
| 190 bool should_block_shelf_auto_hide_; | 193 bool should_block_shelf_auto_hide_; |
| 191 | 194 |
| 192 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; | 195 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; |
| 193 | 196 |
| 194 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); | 197 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); |
| 195 }; | 198 }; |
| 196 | 199 |
| 197 } // namespace ash | 200 } // namespace ash |
| 198 | 201 |
| 199 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ | 202 #endif // ASH_COMMON_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ |
| OLD | NEW |