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

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.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
Index: chrome/browser/ui/app_list/app_list_view_delegate.h
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
index 761ba3b3f38497203a191f396d88eeca3350c2fc..ad9d61ab455aa609a188f420e9dbfd4160f55329 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -18,6 +18,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/app_list/app_list_view_delegate.h"
+#include "ui/app_list/speech_ui_model.h"
class AppListControllerDelegate;
class Profile;
@@ -63,6 +64,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
virtual app_list::AppListModel* GetModel() OVERRIDE;
virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE;
+ virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE;
virtual void GetShortcutPathForApp(
const std::string& app_id,
const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE;
@@ -90,8 +92,11 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
app_list::AppListViewDelegateObserver* observer) OVERRIDE;
// Overridden from app_list::StartPageObserver:
- virtual void OnSearch(const base::string16& query) OVERRIDE;
- virtual void OnSpeechRecognitionStateChanged(bool recognizing) OVERRIDE;
+ virtual void OnSpeechResult(const base::string16& result,
+ bool is_final) OVERRIDE;
+ virtual void OnSpeechSoundLevelChanged(int16 level) OVERRIDE;
+ virtual void OnSpeechRecognitionStateChanged(
+ app_list::SpeechRecognitionState new_state) OVERRIDE;
// Overridden from content::NotificationObserver:
virtual void Observe(int type,
@@ -116,6 +121,8 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
// if |profile_| changes.
app_list::AppListModel* model_;
+ app_list::SpeechUIModel speech_ui_;
+
Users users_;
content::NotificationRegistrar registrar_;
« no previous file with comments | « chrome/browser/resources/app_list/speech_recognition_manager.js ('k') | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698