Index: ash/common/system/chromeos/palette/palette_tray.h |
diff --git a/ash/common/system/chromeos/palette/palette_tray.h b/ash/common/system/chromeos/palette/palette_tray.h |
index ad5dd9ecc66edda9425a804b3885bb8130a5861f..1d074507e7aa99d3226ab25046536fe1aa36d21e 100644 |
--- a/ash/common/system/chromeos/palette/palette_tray.h |
+++ b/ash/common/system/chromeos/palette/palette_tray.h |
@@ -57,6 +57,8 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView, |
// PaletteToolManager::Delegate: |
void HidePalette() override; |
+ void RecordPaletteOptionsUsage(PaletteTrayOptions option) override; |
+ void RecordPaletteModeCancellation(PaletteModeCancelType type) override; |
// Returns true if the shelf should not autohide. |
bool ShouldBlockShelfAutoHide() const; |
@@ -113,6 +115,14 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView, |
// Weak pointer, will be parented by TrayContainer for its lifetime. |
views::ImageView* icon_; |
+ // Used to indicate whether the palette bubble is automatically opened by a |
+ // stylus |
jdufault
2016/09/08 19:51:35
nit: fix wrapping
xiaoyinh(OOO Sep 11-29)
2016/09/08 23:20:58
Done.
|
+ // eject event. |
+ bool is_bubble_auto_opened_ = false; |
+ |
+ // Number of actions in pen palette bubble. |
+ int num_actions_in_bubble_ = 0; |
+ |
base::WeakPtrFactory<PaletteTray> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(PaletteTray); |