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/app_list_model.h" | 5 #include "ui/app_list/app_list_model.h" |
6 | 6 |
7 #include "ui/app_list/app_list_item_model.h" | 7 #include "ui/app_list/app_list_item_model.h" |
8 #include "ui/app_list/app_list_model_observer.h" | 8 #include "ui/app_list/app_list_model_observer.h" |
9 #include "ui/app_list/search_box_model.h" | 9 #include "ui/app_list/search_box_model.h" |
10 #include "ui/app_list/search_result.h" | 10 #include "ui/app_list/search_result.h" |
| 11 #include "ui/app_list/speech_ui_model.h" |
11 | 12 |
12 namespace app_list { | 13 namespace app_list { |
13 | 14 |
14 AppListModel::AppListModel() | 15 AppListModel::AppListModel() |
15 : item_list_(new AppListItemList), | 16 : item_list_(new AppListItemList), |
16 search_box_(new SearchBoxModel), | 17 search_box_(new SearchBoxModel), |
17 results_(new SearchResults), | 18 results_(new SearchResults), |
| 19 speech_ui_(new SpeechUIModel(search_box_.get())), |
18 signed_in_(false), | 20 signed_in_(false), |
19 status_(STATUS_NORMAL) { | 21 status_(STATUS_NORMAL) { |
20 } | 22 } |
21 | 23 |
22 AppListModel::~AppListModel() { | 24 AppListModel::~AppListModel() { |
23 } | 25 } |
24 | 26 |
25 void AppListModel::AddObserver(AppListModelObserver* observer) { | 27 void AppListModel::AddObserver(AppListModelObserver* observer) { |
26 observers_.AddObserver(observer); | 28 observers_.AddObserver(observer); |
27 } | 29 } |
(...skipping 16 matching lines...) Expand all Loading... |
44 if (signed_in_ == signed_in) | 46 if (signed_in_ == signed_in) |
45 return; | 47 return; |
46 | 48 |
47 signed_in_ = signed_in; | 49 signed_in_ = signed_in; |
48 FOR_EACH_OBSERVER(AppListModelObserver, | 50 FOR_EACH_OBSERVER(AppListModelObserver, |
49 observers_, | 51 observers_, |
50 OnAppListModelSigninStatusChanged()); | 52 OnAppListModelSigninStatusChanged()); |
51 } | 53 } |
52 | 54 |
53 } // namespace app_list | 55 } // namespace app_list |
OLD | NEW |