Remove ShouldBlockShelfAutoHide().

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
@@ skipping 256 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebNotificationLabel);
 };
 
 WebNotificationTray::WebNotificationTray(WmShelf* shelf,
                                          WmWindow* status_area_window,
                                          SystemTray* system_tray)
     : TrayBackgroundView(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_);
 
   SetInkDropMode(InkDropMode::ON);
   gfx::ImageSkia bell_image =
       CreateVectorIcon(kShelfNotificationsIcon, kShelfIconColor);
   bell_icon_.reset(
       new WebNotificationImage(bell_image, animation_container_.get(), this));
   tray_container()->AddChildView(bell_icon_.get());
@@ skipping 27 matching lines @@
 void WebNotificationTray::DisableAnimationsForTest(bool disable) {
   disable_animations_for_test = disable;
 }
 
 // Public methods.
 
 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());
 
   // In the horizontal case, message center starts from the top of the shelf.
   // In the vertical case, it starts from the bottom of WebNotificationTray.
   const int max_height = shelf()->IsHorizontalAlignment()
                              ? shelf()->GetIdealBounds().y()
                              : GetBoundsInScreen().bottom();
   message_center_bubble->SetMaxHeight(max_height);
@@ skipping 20 matching lines @@
 
 bool WebNotificationTray::ShowMessageCenter() {
   return ShowMessageCenterInternal(false /* show_settings */);
 }
 
 void WebNotificationTray::HideMessageCenter() {
   if (!message_center_bubble())
     return;
   SetIsActive(false);
   message_center_bubble_.reset();
-  should_block_shelf_auto_hide_ = false;
   show_message_center_on_unlock_ = false;
   shelf()->UpdateAutoHideState();
 }
 
 void WebNotificationTray::SetTrayBubbleHeight(int height) {
   popup_alignment_delegate_->SetTrayBubbleHeight(height);
 }
 
 int WebNotificationTray::tray_bubble_height_for_test() const {
   return popup_alignment_delegate_->tray_bubble_height_for_test();
@@ skipping 12 matching lines @@
   popup_collection_->MarkAllPopupsShown();
 }
 
 // Private methods.
 
 bool WebNotificationTray::ShouldShowMessageCenter() const {
   // Hidden at login screen, during supervised user creation, etc.
   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());
 }
 
 void WebNotificationTray::ShowMessageCenterBubble() {
   if (!IsMessageCenterBubbleVisible())
     message_center_tray_->ShowMessageCenterBubble();
 }
 
@@ skipping 202 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash