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

Side by Side Diff: chrome/browser/ui/webui/app_list/start_page_handler.cc

Issue 225043002: Move extension_icon_set.{h,cc} to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/ui/webui/app_list/start_page_handler.h" 5 #include "chrome/browser/ui/webui/app_list/start_page_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/search/hotword_service.h" 15 #include "chrome/browser/search/hotword_service.h"
16 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 16 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
17 #include "chrome/browser/ui/app_list/app_list_service.h" 17 #include "chrome/browser/ui/app_list/app_list_service.h"
18 #include "chrome/browser/ui/app_list/recommended_apps.h" 18 #include "chrome/browser/ui/app_list/recommended_apps.h"
19 #include "chrome/browser/ui/app_list/start_page_service.h" 19 #include "chrome/browser/ui/app_list/start_page_service.h"
20 #include "chrome/browser/ui/host_desktop.h" 20 #include "chrome/browser/ui/host_desktop.h"
21 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 21 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
22 #include "chrome/common/extensions/extension_icon_set.h"
23 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
24 #include "content/public/browser/notification_details.h" 23 #include "content/public/browser/notification_details.h"
25 #include "content/public/browser/notification_source.h" 24 #include "content/public/browser/notification_source.h"
26 #include "content/public/browser/web_contents_view.h" 25 #include "content/public/browser/web_contents_view.h"
27 #include "content/public/browser/web_ui.h" 26 #include "content/public/browser/web_ui.h"
28 #include "extensions/browser/extension_system.h" 27 #include "extensions/browser/extension_system.h"
29 #include "extensions/common/extension.h" 28 #include "extensions/common/extension.h"
29 #include "extensions/common/extension_icon_set.h"
30 #include "ui/app_list/app_list_switches.h" 30 #include "ui/app_list/app_list_switches.h"
31 #include "ui/app_list/speech_ui_model_observer.h" 31 #include "ui/app_list/speech_ui_model_observer.h"
32 #include "ui/events/event_constants.h" 32 #include "ui/events/event_constants.h"
33 33
34 namespace app_list { 34 namespace app_list {
35 35
36 namespace { 36 namespace {
37 37
38 scoped_ptr<base::DictionaryValue> CreateAppInfo( 38 scoped_ptr<base::DictionaryValue> CreateAppInfo(
39 const extensions::Extension* app) { 39 const extensions::Extension* app) {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 else if (state_string == "STOPPING") 232 else if (state_string == "STOPPING")
233 new_state = SPEECH_RECOGNITION_STOPPING; 233 new_state = SPEECH_RECOGNITION_STOPPING;
234 234
235 StartPageService* service = 235 StartPageService* service =
236 StartPageService::Get(Profile::FromWebUI(web_ui())); 236 StartPageService::Get(Profile::FromWebUI(web_ui()));
237 if (service) 237 if (service)
238 service->OnSpeechRecognitionStateChanged(new_state); 238 service->OnSpeechRecognitionStateChanged(new_state);
239 } 239 }
240 240
241 } // namespace app_list 241 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/infobars/extension_infobar.cc ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698