Index: ash/system/palette/palette_tray.cc |
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc |
index f6c46f8ca65698b80e9b07bc98aae4e304d35503..025ae1f07cbb0b5a3fe8d969c599f812deb04db2 100644 |
--- a/ash/system/palette/palette_tray.cc |
+++ b/ash/system/palette/palette_tray.cc |
@@ -179,10 +179,6 @@ bool PaletteTray::ShowPalette() { |
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. |
@@ -315,7 +311,6 @@ void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) { |
} |
void PaletteTray::HidePalette() { |
- should_block_shelf_auto_hide_ = false; |
is_bubble_auto_opened_ = false; |
num_actions_in_bubble_ = 0; |
bubble_.reset(); |
@@ -350,10 +345,6 @@ void PaletteTray::RecordPaletteModeCancellation(PaletteModeCancelType 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(); |