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

Unified Diff: chrome/browser/ui/app_list/search/search_controller.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
Index: chrome/browser/ui/app_list/search/search_controller.cc
diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc
index 7983a8d46ba3c070f56f01c77770c20833390049..ce48663156efa15f5bb63a88596ada2d73d81870 100644
--- a/chrome/browser/ui/app_list/search/search_controller.cc
+++ b/chrome/browser/ui/app_list/search/search_controller.cc
@@ -60,16 +60,11 @@ void SearchController::Init() {
search_box_->SetIcon(*bundle.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
if (StartPageService::Get(profile_)) {
search_box_->SetSpeechRecognitionButton(
- scoped_ptr<SearchBoxModel::ToggleButtonProperty>(
- new SearchBoxModel::ToggleButtonProperty(
- // Right now provides the same image for both state.
- // TODO(mukai, jennschen): Replace them by the real images.
+ scoped_ptr<SearchBoxModel::ButtonProperty>(
+ new SearchBoxModel::ButtonProperty(
*bundle.GetImageSkiaNamed(IDR_OMNIBOX_MIC_SEARCH),
- *bundle.GetImageSkiaNamed(IDR_OMNIBOX_MIC_SEARCH),
- l10n_util::GetStringUTF16(
- IDS_APP_LIST_START_SPEECH_RECOGNITION),
l10n_util::GetStringUTF16(
- IDS_APP_LIST_STOP_SPEECH_RECOGNITION))));
+ IDS_APP_LIST_START_SPEECH_RECOGNITION))));
}
mixer_->Init();
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.cc ('k') | chrome/browser/ui/app_list/start_page_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698