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

Side by Side Diff: chrome/browser/ui/app_list/app_list_view_delegate.h

Issue 796293002: App list voice searches now prioritize exact-match web results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed MixerTest and add MixerTest.VoiceQuery. Created 6 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 unified diff | Download patch
OLDNEW
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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 // Note: order ensures |search_resource_manager_| is destroyed before 162 // Note: order ensures |search_resource_manager_| is destroyed before
163 // |speech_ui_|. 163 // |speech_ui_|.
164 scoped_ptr<app_list::SpeechUIModel> speech_ui_; 164 scoped_ptr<app_list::SpeechUIModel> speech_ui_;
165 scoped_ptr<app_list::SearchResourceManager> search_resource_manager_; 165 scoped_ptr<app_list::SearchResourceManager> search_resource_manager_;
166 scoped_ptr<app_list::SearchController> search_controller_; 166 scoped_ptr<app_list::SearchController> search_controller_;
167 167
168 scoped_ptr<app_list::LauncherPageEventDispatcher> 168 scoped_ptr<app_list::LauncherPageEventDispatcher>
169 launcher_page_event_dispatcher_; 169 launcher_page_event_dispatcher_;
170 170
171 base::TimeDelta auto_launch_timeout_; 171 base::TimeDelta auto_launch_timeout_;
172 // Determines whether the current search was initiate by speech.
calamity 2014/12/16 01:50:03 s/initiate/initiated/
Matt Giuca 2014/12/16 02:04:09 Done.
173 bool is_voice_query_;
172 174
173 Users users_; 175 Users users_;
174 176
175 #if defined(USE_ASH) 177 #if defined(USE_ASH)
176 scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; 178 scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;
177 #endif 179 #endif
178 180
179 ObserverList<app_list::AppListViewDelegateObserver> observers_; 181 ObserverList<app_list::AppListViewDelegateObserver> observers_;
180 182
181 // Used to track the SigninManagers that this instance is observing so that 183 // Used to track the SigninManagers that this instance is observing so that
182 // this instance can be removed as an observer on its destruction. 184 // this instance can be removed as an observer on its destruction.
183 ScopedObserver<SigninManagerBase, AppListViewDelegate> scoped_observer_; 185 ScopedObserver<SigninManagerBase, AppListViewDelegate> scoped_observer_;
184 186
185 // Window contents of additional custom launcher pages. 187 // Window contents of additional custom launcher pages.
186 ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_; 188 ScopedVector<apps::CustomLauncherPageContents> custom_page_contents_;
187 189
188 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages. 190 // Registers for NOTIFICATION_APP_TERMINATING to unload custom launcher pages.
189 content::NotificationRegistrar registrar_; 191 content::NotificationRegistrar registrar_;
190 192
191 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate); 193 DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
192 }; 194 };
193 195
194 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ 196 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | ui/app_list/app_list_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698