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

Unified Diff: ui/app_list/search_box_model.cc

Issue 149753002: Enables the 'hotword not listening' icon in the search box. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix breaks Created 6 years, 11 months 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/search_box_model.h ('k') | ui/app_list/speech_ui_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/search_box_model.cc
diff --git a/ui/app_list/search_box_model.cc b/ui/app_list/search_box_model.cc
index cd884a7d20d61efae4e6413164bae6296ea574de..006c4b3f312b27e24908764d889ceba73f4d7243 100644
--- a/ui/app_list/search_box_model.cc
+++ b/ui/app_list/search_box_model.cc
@@ -9,14 +9,18 @@
namespace app_list {
-SearchBoxModel::ButtonProperty::ButtonProperty(
- const gfx::ImageSkia& icon,
- const base::string16& tooltip)
- : icon(icon),
- tooltip(tooltip) {
+SearchBoxModel::SpeechButtonProperty::SpeechButtonProperty(
+ const gfx::ImageSkia& on_icon,
+ const base::string16& on_tooltip,
+ const gfx::ImageSkia& off_icon,
+ const base::string16& off_tooltip)
+ : on_icon(on_icon),
+ on_tooltip(on_tooltip),
+ off_icon(off_icon),
+ off_tooltip(off_tooltip) {
}
-SearchBoxModel::ButtonProperty::~ButtonProperty() {
+SearchBoxModel::SpeechButtonProperty::~SpeechButtonProperty() {
}
SearchBoxModel::SearchBoxModel() {
@@ -31,7 +35,7 @@ void SearchBoxModel::SetIcon(const gfx::ImageSkia& icon) {
}
void SearchBoxModel::SetSpeechRecognitionButton(
- scoped_ptr<SearchBoxModel::ButtonProperty> speech_button) {
+ scoped_ptr<SearchBoxModel::SpeechButtonProperty> speech_button) {
speech_button_ = speech_button.Pass();
FOR_EACH_OBSERVER(SearchBoxModelObserver,
observers_,
« no previous file with comments | « ui/app_list/search_box_model.h ('k') | ui/app_list/speech_ui_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698