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

Side by Side Diff: ash/shell/app_list.cc

Issue 149753002: Enables the 'hotword not listening' icon in the search box. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix breaks Created 6 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <string> 5 #include <string>
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell/example_factory.h" 9 #include "ash/shell/example_factory.h"
10 #include "ash/shell/toplevel_window.h" 10 #include "ash/shell/toplevel_window.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 private: 191 private:
192 WindowTypeLauncherItem::Type type_; 192 WindowTypeLauncherItem::Type type_;
193 193
194 DISALLOW_COPY_AND_ASSIGN(ExampleSearchResult); 194 DISALLOW_COPY_AND_ASSIGN(ExampleSearchResult);
195 }; 195 };
196 196
197 class ExampleAppListViewDelegate : public app_list::AppListViewDelegate { 197 class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {
198 public: 198 public:
199 ExampleAppListViewDelegate() 199 ExampleAppListViewDelegate()
200 : model_(new app_list::AppListModel) { 200 : model_(new app_list::AppListModel),
201 speech_ui_(app_list::SPEECH_RECOGNITION_OFF) {
201 PopulateApps(); 202 PopulateApps();
202 DecorateSearchBox(model_->search_box()); 203 DecorateSearchBox(model_->search_box());
203 } 204 }
204 205
205 private: 206 private:
206 void PopulateApps() { 207 void PopulateApps() {
207 for (int i = 0; 208 for (int i = 0;
208 i < static_cast<int>(WindowTypeLauncherItem::LAST_TYPE); 209 i < static_cast<int>(WindowTypeLauncherItem::LAST_TYPE);
209 ++i) { 210 ++i) {
210 WindowTypeLauncherItem::Type type = 211 WindowTypeLauncherItem::Type type =
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 }; 367 };
367 368
368 } // namespace 369 } // namespace
369 370
370 app_list::AppListViewDelegate* CreateAppListViewDelegate() { 371 app_list::AppListViewDelegate* CreateAppListViewDelegate() {
371 return new ExampleAppListViewDelegate; 372 return new ExampleAppListViewDelegate;
372 } 373 }
373 374
374 } // namespace shell 375 } // namespace shell
375 } // namespace ash 376 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698