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..2502ea7b1b60ef2a754fce1d03fd2e127c785fd4 100644 |
--- a/ash/system/palette/palette_tray.h |
+++ b/ash/system/palette/palette_tray.h |
@@ -44,9 +44,6 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView, |
explicit PaletteTray(Shelf* shelf); |
~PaletteTray() override; |
- // ActionableView: |
- bool PerformAction(const ui::Event& event) override; |
- |
// SessionObserver: |
void OnSessionStateChanged(session_manager::SessionState state) override; |
@@ -59,6 +56,11 @@ 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; |
+ void OnGestureEvent(ui::GestureEvent* event) override; |
// PaletteToolManager::Delegate: |
void HidePalette() override; |
@@ -66,10 +68,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); |
@@ -90,6 +88,7 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView, |
base::string16 GetAccessibleNameForBubble() override; |
bool ShouldEnableExtraKeyboardAccessibility() override; |
void HideBubble(const views::TrayBubbleView* bubble_view) override; |
+ bool ProcessGestureEventForBubble(ui::GestureEvent* event) override; |
// PaletteToolManager::Delegate: |
void OnActiveToolChanged() override; |