| Index: ash/system/palette/palette_tray.h
|
| diff --git a/ash/system/palette/palette_tray.h b/ash/system/palette/palette_tray.h
|
| index 3d818a9afeb8b90e9e6c27d5f62427f739a693b3..f8375c8b101adaa46de52cacec3ad0acc1faf4e5 100644
|
| --- a/ash/system/palette/palette_tray.h
|
| +++ b/ash/system/palette/palette_tray.h
|
| @@ -38,15 +38,11 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
|
| public SessionObserver,
|
| public ShellObserver,
|
| public PaletteToolManager::Delegate,
|
| - public ui::InputDeviceEventObserver,
|
| - public views::TrayBubbleView::Delegate {
|
| + public ui::InputDeviceEventObserver {
|
| public:
|
| explicit PaletteTray(Shelf* shelf);
|
| ~PaletteTray() override;
|
|
|
| - // ActionableView:
|
| - bool PerformAction(const ui::Event& event) override;
|
| -
|
| // SessionObserver:
|
| void OnSessionStateChanged(session_manager::SessionState state) override;
|
|
|
| @@ -59,6 +55,10 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
|
| void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
|
| void AnchorUpdated() override;
|
| void Initialize() override;
|
| + bool PerformAction(const ui::Event& event) override;
|
| + void CloseBubble() override;
|
| + void ShowBubble() override;
|
| + views::TrayBubbleView* GetBubbleView() override;
|
|
|
| // PaletteToolManager::Delegate:
|
| void HidePalette() override;
|
| @@ -66,10 +66,6 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
|
| void RecordPaletteOptionsUsage(PaletteTrayOptions option) override;
|
| void RecordPaletteModeCancellation(PaletteModeCancelType type) override;
|
|
|
| - // Opens up the palette if it is not already open. Returns true if the palette
|
| - // was opened.
|
| - bool ShowPalette();
|
| -
|
| // Returns true if the palette tray contains the given point. This is useful
|
| // for determining if an event should be propagated through to the palette.
|
| bool ContainsPointInScreen(const gfx::Point& point);
|
|
|