| Index: ash/system/web_notification/web_notification_tray.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
|
| index e3bc136932ceea183ae2b488808f4db1a92912b5..eafdca6f1fc9d1ee4bfbeedd53977c29ad8304cb 100644
|
| --- a/ash/system/web_notification/web_notification_tray.cc
|
| +++ b/ash/system/web_notification/web_notification_tray.cc
|
| @@ -274,8 +274,7 @@ WebNotificationTray::WebNotificationTray(WmShelf* shelf,
|
| status_area_window_(status_area_window),
|
| system_tray_(system_tray),
|
| show_message_center_on_unlock_(false),
|
| - should_update_tray_content_(false),
|
| - should_block_shelf_auto_hide_(false) {
|
| + should_update_tray_content_(false) {
|
| DCHECK(shelf);
|
| DCHECK(status_area_window_);
|
| DCHECK(system_tray_);
|
| @@ -323,7 +322,6 @@ bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
|
| if (!ShouldShowMessageCenter())
|
| return false;
|
|
|
| - should_block_shelf_auto_hide_ = true;
|
| message_center::MessageCenterBubble* message_center_bubble =
|
| new message_center::MessageCenterBubble(message_center(),
|
| message_center_tray_.get());
|
| @@ -364,7 +362,6 @@ void WebNotificationTray::HideMessageCenter() {
|
| return;
|
| SetIsActive(false);
|
| message_center_bubble_.reset();
|
| - should_block_shelf_auto_hide_ = false;
|
| show_message_center_on_unlock_ = false;
|
| shelf()->UpdateAutoHideState();
|
| }
|
| @@ -397,10 +394,6 @@ bool WebNotificationTray::ShouldShowMessageCenter() const {
|
| return Shell::Get()->session_controller()->ShouldShowNotificationTray();
|
| }
|
|
|
| -bool WebNotificationTray::ShouldBlockShelfAutoHide() const {
|
| - return should_block_shelf_auto_hide_;
|
| -}
|
| -
|
| bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
|
| return (message_center_bubble() &&
|
| message_center_bubble()->bubble()->IsVisible());
|
|
|