OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/app_list/search_box_model.h" | 5 #include "ui/app_list/search_box_model.h" |
6 | 6 |
7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
8 #include "ui/app_list/search_box_model_observer.h" | 8 #include "ui/app_list/search_box_model_observer.h" |
9 | 9 |
10 namespace app_list { | 10 namespace app_list { |
11 | 11 |
12 SearchBoxModel::SpeechButtonProperty::SpeechButtonProperty( | 12 SearchBoxModel::SpeechButtonProperty::SpeechButtonProperty( |
13 const gfx::ImageSkia& on_icon, | 13 const gfx::ImageSkia& on_icon, |
14 const base::string16& on_tooltip, | 14 const base::string16& on_tooltip, |
15 const gfx::ImageSkia& off_icon, | 15 const gfx::ImageSkia& off_icon, |
16 const base::string16& off_tooltip) | 16 const base::string16& off_tooltip, |
| 17 const base::string16& accessible_name) |
17 : on_icon(on_icon), | 18 : on_icon(on_icon), |
18 on_tooltip(on_tooltip), | 19 on_tooltip(on_tooltip), |
19 off_icon(off_icon), | 20 off_icon(off_icon), |
20 off_tooltip(off_tooltip) { | 21 off_tooltip(off_tooltip), |
| 22 accessible_name(accessible_name) { |
21 } | 23 } |
22 | 24 |
23 SearchBoxModel::SpeechButtonProperty::~SpeechButtonProperty() { | 25 SearchBoxModel::SpeechButtonProperty::~SpeechButtonProperty() { |
24 } | 26 } |
25 | 27 |
26 SearchBoxModel::SearchBoxModel() { | 28 SearchBoxModel::SearchBoxModel() { |
27 } | 29 } |
28 | 30 |
29 SearchBoxModel::~SearchBoxModel() { | 31 SearchBoxModel::~SearchBoxModel() { |
30 } | 32 } |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 85 |
84 void SearchBoxModel::AddObserver(SearchBoxModelObserver* observer) { | 86 void SearchBoxModel::AddObserver(SearchBoxModelObserver* observer) { |
85 observers_.AddObserver(observer); | 87 observers_.AddObserver(observer); |
86 } | 88 } |
87 | 89 |
88 void SearchBoxModel::RemoveObserver(SearchBoxModelObserver* observer) { | 90 void SearchBoxModel::RemoveObserver(SearchBoxModelObserver* observer) { |
89 observers_.RemoveObserver(observer); | 91 observers_.RemoveObserver(observer); |
90 } | 92 } |
91 | 93 |
92 } // namespace app_list | 94 } // namespace app_list |
OLD | NEW |