Remove ShouldBlockShelfAutoHide().

ash/system/palette/palette_tray.cc

 // Copyright 2016 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/palette/palette_tray.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
@@ skipping 161 matching lines @@
 
   DCHECK(tray_container());
 
   views::TrayBubbleView::InitParams init_params(GetAnchorAlignment(),
                                                 kPaletteWidth, kPaletteWidth);
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   DCHECK(tray_container());
 
-  // The views::TrayBubbleView ctor will cause a shelf auto hide update check.
-  // Make sure to block auto hiding before that check happens.
-  should_block_shelf_auto_hide_ = true;
-
   // TODO(tdanderson): Refactor into common row layout code.
   // TODO(tdanderson|jdufault): Add material design ripple effects to the menu
   // rows.
 
   // Create and customize bubble view.
   views::TrayBubbleView* bubble_view =
       views::TrayBubbleView::Create(GetBubbleAnchor(), this, &init_params);
   bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets());
   bubble_view->set_margins(
       gfx::Insets(kPalettePaddingOnTop, 0, kPalettePaddingOnBottom, 0));
@@ skipping 112 matching lines @@
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           bubble_widget, kShellWindowId_SettingBubbleContainer, params);
 }
 
 void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
 void PaletteTray::HidePalette() {
-  should_block_shelf_auto_hide_ = false;
   is_bubble_auto_opened_ = false;
   num_actions_in_bubble_ = 0;
   bubble_.reset();
 
   shelf()->UpdateAutoHideState();
 }
 
 void PaletteTray::HidePaletteImmediately() {
   if (bubble_)
     bubble_->bubble_widget()->SetVisibilityChangedAnimationsEnabled(false);
@@ skipping 14 matching lines @@
 
 void PaletteTray::RecordPaletteModeCancellation(PaletteModeCancelType type) {
   if (type == PaletteModeCancelType::PALETTE_MODE_CANCEL_TYPE_COUNT)
     return;
 
   UMA_HISTOGRAM_ENUMERATION(
       "Ash.Shelf.Palette.ModeCancellation", type,
       PaletteModeCancelType::PALETTE_MODE_CANCEL_TYPE_COUNT);
 }
 
-bool PaletteTray::ShouldBlockShelfAutoHide() const {
-  return should_block_shelf_auto_hide_;
-}
-
 void PaletteTray::OnActiveToolChanged() {
   ++num_actions_in_bubble_;
   UpdateTrayIcon();
 }
 
 WmWindow* PaletteTray::GetWindow() {
   return shelf()->GetWindow();
 }
 
 void PaletteTray::AnchorUpdated() {
@@ skipping 30 matching lines @@
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(is_palette_enabled_ && palette_utils::HasStylusInput() &&
              IsInUserSession());
 }
 
 }  // namespace ash