| 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 2d362d901d84bec2fab7374b1c5c35537e002eef..5524ab5abc5a431015190ca70225784a8f8f852f 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.h
|
| +++ b/ash/common/system/chromeos/palette/palette_tray.h
|
| @@ -9,13 +9,13 @@
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ash/common/palette_delegate.h"
|
| #include "ash/common/session/session_state_observer.h"
|
| #include "ash/common/shell_observer.h"
|
| #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
|
| #include "ash/common/system/tray/tray_background_view.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "ui/events/devices/input_device_manager.h"
|
|
|
| namespace views {
|
| class ImageView;
|
| @@ -90,12 +90,20 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
|
| // Called when a stylus inserted or removed event is received.
|
| void OnStylusStateChanged(ui::StylusState stylus_state);
|
|
|
| + // Called when the palette enabled pref has changed.
|
| + void OnPaletteEnabledPrefChanged(bool enabled);
|
| +
|
| bool OpenBubble();
|
| void AddToolsToView(views::View* host);
|
|
|
| std::unique_ptr<PaletteToolManager> palette_tool_manager_;
|
| std::unique_ptr<TrayBubbleWrapper> bubble_;
|
|
|
| + // Manages the callback OnPaletteEnabledPrefChanged callback registered to
|
| + // the PaletteDelegate instance.
|
| + std::unique_ptr<PaletteDelegate::EnableListenerSubscription>
|
| + palette_enabled_subscription_;
|
| +
|
| // Weak pointer, will be parented by TrayContainer for its lifetime.
|
| views::ImageView* icon_;
|
|
|
|
|