| 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 #include "ash/common/system/web_notification/web_notification_tray.h" | 5 #include "ash/common/system/web_notification/web_notification_tray.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
| 9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
| 10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 | 435 |
| 436 bool WebNotificationTray::ShouldBlockShelfAutoHide() const { | 436 bool WebNotificationTray::ShouldBlockShelfAutoHide() const { |
| 437 return should_block_shelf_auto_hide_; | 437 return should_block_shelf_auto_hide_; |
| 438 } | 438 } |
| 439 | 439 |
| 440 bool WebNotificationTray::IsMessageCenterBubbleVisible() const { | 440 bool WebNotificationTray::IsMessageCenterBubbleVisible() const { |
| 441 return (message_center_bubble() && | 441 return (message_center_bubble() && |
| 442 message_center_bubble()->bubble()->IsVisible()); | 442 message_center_bubble()->bubble()->IsVisible()); |
| 443 } | 443 } |
| 444 | 444 |
| 445 bool WebNotificationTray::IsMouseInNotificationBubble() const { | |
| 446 return false; | |
| 447 } | |
| 448 | |
| 449 void WebNotificationTray::ShowMessageCenterBubble() { | 445 void WebNotificationTray::ShowMessageCenterBubble() { |
| 450 if (!IsMessageCenterBubbleVisible()) | 446 if (!IsMessageCenterBubbleVisible()) |
| 451 message_center_tray_->ShowMessageCenterBubble(); | 447 message_center_tray_->ShowMessageCenterBubble(); |
| 452 } | 448 } |
| 453 | 449 |
| 454 void WebNotificationTray::UpdateAfterLoginStatusChange( | 450 void WebNotificationTray::UpdateAfterLoginStatusChange( |
| 455 LoginStatus login_status) { | 451 LoginStatus login_status) { |
| 456 message_center()->SetLockedState(login_status == LoginStatus::LOCKED); | 452 message_center()->SetLockedState(login_status == LoginStatus::LOCKED); |
| 457 OnMessageCenterTrayChanged(); | 453 OnMessageCenterTrayChanged(); |
| 458 } | 454 } |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 | 663 |
| 668 message_center::MessageCenterBubble* | 664 message_center::MessageCenterBubble* |
| 669 WebNotificationTray::GetMessageCenterBubbleForTest() { | 665 WebNotificationTray::GetMessageCenterBubbleForTest() { |
| 670 if (!message_center_bubble()) | 666 if (!message_center_bubble()) |
| 671 return nullptr; | 667 return nullptr; |
| 672 return static_cast<message_center::MessageCenterBubble*>( | 668 return static_cast<message_center::MessageCenterBubble*>( |
| 673 message_center_bubble()->bubble()); | 669 message_center_bubble()->bubble()); |
| 674 } | 670 } |
| 675 | 671 |
| 676 } // namespace ash | 672 } // namespace ash |
| OLD | NEW |