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

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: fix 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
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 2d273ceeee5938afbe931dc66fcc090b08ef7d4b..d6f52d60015e0037d2d627ba1a6470358f4c784a 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_model_observer.h"
+#include "ui/app_list/speech_ui_model_observer.h"
#include "ui/views/bubble/bubble_delegate.h"
namespace base {
@@ -24,14 +25,17 @@ class ApplicationDragAndDropHost;
class AppListMainView;
class AppListModel;
class AppListViewDelegate;
+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 AppListModelObserver {
+ public AppListModelObserver,
+ public SpeechUIModelObserver {
public:
class Observer {
public:
@@ -136,14 +140,20 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
// Overridden from AppListModelObserver:
virtual void OnAppListModelSigninStatusChanged() 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<Observer> observers_;
+ scoped_ptr<HideViewAnimationObserver> animation_observer_;
DISALLOW_COPY_AND_ASSIGN(AppListView);
};

Powered by Google App Engine
This is Rietveld 408576698