OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_SHELF_APP_LIST_BUTTON_H_ | 5 #ifndef ASH_SHELF_APP_LIST_BUTTON_H_ |
6 #define ASH_SHELF_APP_LIST_BUTTON_H_ | 6 #define ASH_SHELF_APP_LIST_BUTTON_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 std::unique_ptr<views::InkDrop> CreateInkDrop() override; | 60 std::unique_ptr<views::InkDrop> CreateInkDrop() override; |
61 std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override; | 61 std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override; |
62 void PaintButtonContents(gfx::Canvas* canvas) override; | 62 void PaintButtonContents(gfx::Canvas* canvas) override; |
63 | 63 |
64 private: | 64 private: |
65 // ShellObserver overrides: | 65 // ShellObserver overrides: |
66 void OnAppListVisibilityChanged(bool shown, | 66 void OnAppListVisibilityChanged(bool shown, |
67 aura::Window* root_window) override; | 67 aura::Window* root_window) override; |
68 void OnVoiceInteractionStatusChanged(bool running) override; | 68 void OnVoiceInteractionStatusChanged(bool running) override; |
69 | 69 |
| 70 void StartVoiceInteractionAnimation(); |
| 71 |
70 // True if the app list is currently showing for this display. | 72 // True if the app list is currently showing for this display. |
71 // This is useful because other IsApplistVisible functions aren't per-display. | 73 // This is useful because other IsApplistVisible functions aren't per-display. |
72 bool is_showing_app_list_; | 74 bool is_showing_app_list_; |
73 | 75 |
74 // Color used to paint the background. | 76 // Color used to paint the background. |
75 SkColor background_color_; | 77 SkColor background_color_; |
76 | 78 |
77 InkDropButtonListener* listener_; | 79 InkDropButtonListener* listener_; |
78 ShelfView* shelf_view_; | 80 ShelfView* shelf_view_; |
79 Shelf* shelf_; | 81 Shelf* shelf_; |
80 | 82 |
81 VoiceInteractionOverlay* voice_interaction_overlay_; | 83 VoiceInteractionOverlay* voice_interaction_overlay_; |
82 std::unique_ptr<base::OneShotTimer> voice_interaction_animation_delay_timer_; | 84 std::unique_ptr<base::OneShotTimer> voice_interaction_animation_delay_timer_; |
| 85 std::unique_ptr<base::OneShotTimer> |
| 86 voice_interaction_animation_hide_delay_timer_; |
83 | 87 |
84 bool voice_interaction_running_ = false; | 88 bool voice_interaction_running_ = false; |
85 | 89 |
86 DISALLOW_COPY_AND_ASSIGN(AppListButton); | 90 DISALLOW_COPY_AND_ASSIGN(AppListButton); |
87 }; | 91 }; |
88 | 92 |
89 } // namespace ash | 93 } // namespace ash |
90 | 94 |
91 #endif // ASH_SHELF_APP_LIST_BUTTON_H_ | 95 #endif // ASH_SHELF_APP_LIST_BUTTON_H_ |
OLD | NEW |