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

Unified Diff: ash/shell/app_list.cc

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 | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/app_list.cc
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 07f888eb7bebf5e2f57d930fb92d72f934d5d29d..1359826eebbbc5cf258b15b387c16fa9fc16bae3 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -23,6 +23,7 @@
#include "ui/app_list/app_list_view_delegate.h"
#include "ui/app_list/search_box_model.h"
#include "ui/app_list/search_result.h"
+#include "ui/app_list/speech_ui_model.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
#include "ui/gfx/image/image_skia.h"
@@ -251,6 +252,10 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
return NULL;
}
+ virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE {
+ return &speech_ui_;
+ }
+
virtual void GetShortcutPathForApp(
const std::string& app_id,
const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE {
@@ -338,6 +343,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
}
scoped_ptr<app_list::AppListModel> model_;
+ app_list::SpeechUIModel speech_ui_;
Users users_;
DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698