Chromium Code Reviews| Index: ash/shelf/voice_interaction_overlay.h |
| diff --git a/ash/shelf/voice_interaction_overlay.h b/ash/shelf/voice_interaction_overlay.h |
| index 304eba11ebfd4478c3a44cb0d032861c727bcb6f..552d1ef1e75d471c6ac37ea206281107c243db99 100644 |
| --- a/ash/shelf/voice_interaction_overlay.h |
| +++ b/ash/shelf/voice_interaction_overlay.h |
| @@ -13,23 +13,33 @@ |
| #include "ui/views/animation/ink_drop_painted_layer_delegates.h" |
| #include "ui/views/view.h" |
| +namespace ui { |
| +class CallbackLayerAnimationObserver; |
| +} // namespace ui |
| + |
| namespace ash { |
| class AppListButton; |
| +class VoiceInteractionIconBackground; |
| class ASH_EXPORT VoiceInteractionOverlay : public views::View { |
| public: |
| explicit VoiceInteractionOverlay(AppListButton* host_view); |
| ~VoiceInteractionOverlay() override; |
| - void StartAnimation(); |
| + void StartAnimation(bool show_icon); |
| void EndAnimation(); |
| void BurstAnimation(); |
| + void HideAnimation(); |
| + bool IsBursting() { return is_bursting_; } |
|
oshima
2017/07/06 19:23:55
is_bustring() const
|
| private: |
| + bool AnimationEndedCallback( |
| + const ui::CallbackLayerAnimationObserver& observer); |
| + |
| std::unique_ptr<ui::Layer> ripple_layer_; |
| std::unique_ptr<ui::Layer> icon_layer_; |
| - std::unique_ptr<ui::Layer> background_layer_; |
| + std::unique_ptr<VoiceInteractionIconBackground> background_layer_; |
| AppListButton* host_view_; |
| @@ -37,6 +47,10 @@ class ASH_EXPORT VoiceInteractionOverlay : public views::View { |
| // turning back. |
| bool is_bursting_; |
| + bool show_icon_; |
| + |
| + bool should_hide_animation_; |
| + |
| views::CircleLayerDelegate circle_layer_delegate_; |
| DISALLOW_COPY_AND_ASSIGN(VoiceInteractionOverlay); |