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_, |