| 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;
|
|
|
|
|