Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: ui/app_list/views/app_list_view.h

Issue 105773004: Introduces the speech recognition UI to app_list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/test/app_list_test_view_delegate.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_view.h
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
index 259e59ee6dc3c23c0eb6e954f89c8ae849f73507..fb03c2dd84b4ab6a035a241881ff844df21e7eb4 100644
--- a/ui/app_list/views/app_list_view.h
+++ b/ui/app_list/views/app_list_view.h
@@ -9,6 +9,7 @@
#include "base/observer_list.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/app_list_view_delegate_observer.h"
+#include "ui/app_list/speech_ui_model_observer.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/widget/widget.h"
@@ -22,14 +23,17 @@ class AppListMainView;
class AppListModel;
class AppListViewDelegate;
class AppListViewObserver;
+class HideViewAnimationObserver;
class PaginationModel;
class SigninDelegate;
class SigninView;
+class SpeechView;
// AppListView is the top-level view and controller of app list UI. It creates
// and hosts a AppsGridView and passes AppListModel to it for display.
class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
- public AppListViewDelegateObserver {
+ public AppListViewDelegateObserver,
+ public SpeechUIModelObserver {
public:
// Takes ownership of |delegate|.
@@ -127,14 +131,20 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
virtual void OnWidgetActivationChanged(
views::Widget* widget, bool active) OVERRIDE;
+ // Overridden from SpeechUIModelObserver:
+ virtual void OnSpeechRecognitionStateChanged(
+ SpeechRecognitionState new_state) OVERRIDE;
+
SigninDelegate* GetSigninDelegate();
scoped_ptr<AppListViewDelegate> delegate_;
AppListMainView* app_list_main_view_;
SigninView* signin_view_;
+ SpeechView* speech_view_;
ObserverList<AppListViewObserver> observers_;
+ scoped_ptr<HideViewAnimationObserver> animation_observer_;
DISALLOW_COPY_AND_ASSIGN(AppListView);
};
« no previous file with comments | « ui/app_list/test/app_list_test_view_delegate.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698