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

Unified Diff: ui/app_list/search_box_model.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 | « ui/app_list/search_box_model.h ('k') | ui/app_list/search_box_model_observer.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 d84b33c708e3f3c41efa8af451d28ef44033ba7b..cd884a7d20d61efae4e6413164bae6296ea574de 100644
--- a/ui/app_list/search_box_model.cc
+++ b/ui/app_list/search_box_model.cc
@@ -9,18 +9,14 @@
namespace app_list {
-SearchBoxModel::ToggleButtonProperty::ToggleButtonProperty(
+SearchBoxModel::ButtonProperty::ButtonProperty(
const gfx::ImageSkia& icon,
- const gfx::ImageSkia& toggled_icon,
- const base::string16& tooltip,
- const base::string16& toggled_tooltip)
+ const base::string16& tooltip)
: icon(icon),
- toggled_icon(toggled_icon),
- tooltip(tooltip),
- toggled_tooltip(toggled_tooltip) {
+ tooltip(tooltip) {
}
-SearchBoxModel::ToggleButtonProperty::~ToggleButtonProperty() {
+SearchBoxModel::ButtonProperty::~ButtonProperty() {
}
SearchBoxModel::SearchBoxModel() {
@@ -35,19 +31,13 @@ void SearchBoxModel::SetIcon(const gfx::ImageSkia& icon) {
}
void SearchBoxModel::SetSpeechRecognitionButton(
- scoped_ptr<SearchBoxModel::ToggleButtonProperty> speech_button) {
+ scoped_ptr<SearchBoxModel::ButtonProperty> speech_button) {
speech_button_ = speech_button.Pass();
FOR_EACH_OBSERVER(SearchBoxModelObserver,
observers_,
SpeechRecognitionButtonPropChanged());
}
-void SearchBoxModel::SetSpeechRecognitionButtonState(bool toggled) {
- FOR_EACH_OBSERVER(SearchBoxModelObserver,
- observers_,
- SetSpeechRecognitionButtonState(toggled));
-}
-
void SearchBoxModel::SetHintText(const base::string16& hint_text) {
if (hint_text_ == hint_text)
return;
« no previous file with comments | « ui/app_list/search_box_model.h ('k') | ui/app_list/search_box_model_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698