| 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 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ | 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ |
| 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ | 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 // Note: order ensures |search_resource_manager_| is destroyed before | 124 // Note: order ensures |search_resource_manager_| is destroyed before |
| 125 // |speech_ui_|. | 125 // |speech_ui_|. |
| 126 std::unique_ptr<app_list::SpeechUIModel> speech_ui_; | 126 std::unique_ptr<app_list::SpeechUIModel> speech_ui_; |
| 127 std::unique_ptr<app_list::SearchResourceManager> search_resource_manager_; | 127 std::unique_ptr<app_list::SearchResourceManager> search_resource_manager_; |
| 128 std::unique_ptr<app_list::SearchController> search_controller_; | 128 std::unique_ptr<app_list::SearchController> search_controller_; |
| 129 | 129 |
| 130 std::unique_ptr<app_list::LauncherPageEventDispatcher> | 130 std::unique_ptr<app_list::LauncherPageEventDispatcher> |
| 131 launcher_page_event_dispatcher_; | 131 launcher_page_event_dispatcher_; |
| 132 | 132 |
| 133 base::TimeDelta auto_launch_timeout_; | 133 base::TimeDelta auto_launch_timeout_; |
| 134 // Determines whether the current search was initiated by speech. | |
| 135 bool is_voice_query_; | |
| 136 | 134 |
| 137 std::unique_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; | 135 std::unique_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; |
| 138 | 136 |
| 139 ScopedObserver<TemplateURLService, AppListViewDelegate> | 137 ScopedObserver<TemplateURLService, AppListViewDelegate> |
| 140 template_url_service_observer_; | 138 template_url_service_observer_; |
| 141 | 139 |
| 142 // Window contents of additional custom launcher pages. | 140 // Window contents of additional custom launcher pages. |
| 143 std::vector<std::unique_ptr<app_list::CustomLauncherPageContents>> | 141 std::vector<std::unique_ptr<app_list::CustomLauncherPageContents>> |
| 144 custom_page_contents_; | 142 custom_page_contents_; |
| 145 | 143 |
| 146 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages. | 144 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages. |
| 147 content::NotificationRegistrar registrar_; | 145 content::NotificationRegistrar registrar_; |
| 148 | 146 |
| 149 std::unique_ptr<app_list::SearchAnswerWebContentsDelegate> | 147 std::unique_ptr<app_list::SearchAnswerWebContentsDelegate> |
| 150 search_answer_delegate_; | 148 search_answer_delegate_; |
| 151 | 149 |
| 152 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); | 150 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); |
| 153 }; | 151 }; |
| 154 | 152 |
| 155 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ | 153 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ |
| OLD | NEW |