Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2781)

Unified Diff: ash/system/palette/palette_tray.h

Issue 2831233003: Remove ShouldBlockShelfAutoHide(). (Closed)
Patch Set: rename and rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray_unittest.cc ('k') | ash/system/palette/palette_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/palette/palette_tray.h
diff --git a/ash/system/palette/palette_tray.h b/ash/system/palette/palette_tray.h
index 5bd0deb6fa36658d009e77e93ec2a92dd0154144..0218715a3d63ef41799394f8f7513a7d3df368e4 100644
--- a/ash/system/palette/palette_tray.h
+++ b/ash/system/palette/palette_tray.h
@@ -66,9 +66,6 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
void RecordPaletteOptionsUsage(PaletteTrayOptions option) override;
void RecordPaletteModeCancellation(PaletteModeCancelType type) override;
- // Returns true if the shelf should not autohide.
- bool ShouldBlockShelfAutoHide() const;
-
// Opens up the palette if it is not already open. Returns true if the palette
// was opened.
bool ShowPalette();
@@ -117,11 +114,6 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
// Weak pointer, will be parented by TrayContainer for its lifetime.
views::ImageView* icon_;
- // The shelf auto-hide state is checked during the tray constructor, so we
- // have to use a helper variable instead of just checking if we have a tray
- // instance.
- bool should_block_shelf_auto_hide_ = false;
-
// Cached palette enabled/disabled pref value.
bool is_palette_enabled_ = true;
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray_unittest.cc ('k') | ash/system/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698