| OLD | NEW |
| 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/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
| 13 #include "chrome/browser/extensions/extension_system.h" | |
| 14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 14 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
| 16 #include "chrome/browser/ui/app_list/app_list_service.h" | 15 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 17 #include "chrome/browser/ui/app_list/recommended_apps.h" | 16 #include "chrome/browser/ui/app_list/recommended_apps.h" |
| 18 #include "chrome/browser/ui/app_list/start_page_service.h" | 17 #include "chrome/browser/ui/app_list/start_page_service.h" |
| 19 #include "chrome/browser/ui/host_desktop.h" | 18 #include "chrome/browser/ui/host_desktop.h" |
| 20 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 19 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
| 21 #include "chrome/common/extensions/extension_icon_set.h" | 20 #include "chrome/common/extensions/extension_icon_set.h" |
| 22 #include "content/public/browser/web_contents_view.h" | 21 #include "content/public/browser/web_contents_view.h" |
| 23 #include "content/public/browser/web_ui.h" | 22 #include "content/public/browser/web_ui.h" |
| 23 #include "extensions/browser/extension_system.h" |
| 24 #include "extensions/common/extension.h" | 24 #include "extensions/common/extension.h" |
| 25 #include "ui/app_list/speech_ui_model_observer.h" | 25 #include "ui/app_list/speech_ui_model_observer.h" |
| 26 #include "ui/events/event_constants.h" | 26 #include "ui/events/event_constants.h" |
| 27 | 27 |
| 28 namespace app_list { | 28 namespace app_list { |
| 29 | 29 |
| 30 namespace { | 30 namespace { |
| 31 | 31 |
| 32 scoped_ptr<base::DictionaryValue> CreateAppInfo( | 32 scoped_ptr<base::DictionaryValue> CreateAppInfo( |
| 33 const extensions::Extension* app) { | 33 const extensions::Extension* app) { |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 new_state = SPEECH_RECOGNITION_ON; | 158 new_state = SPEECH_RECOGNITION_ON; |
| 159 else if (state_string == "in-speech") | 159 else if (state_string == "in-speech") |
| 160 new_state = SPEECH_RECOGNITION_IN_SPEECH; | 160 new_state = SPEECH_RECOGNITION_IN_SPEECH; |
| 161 | 161 |
| 162 StartPageService* service = | 162 StartPageService* service = |
| 163 StartPageService::Get(Profile::FromWebUI(web_ui())); | 163 StartPageService::Get(Profile::FromWebUI(web_ui())); |
| 164 service->OnSpeechRecognitionStateChanged(new_state); | 164 service->OnSpeechRecognitionStateChanged(new_state); |
| 165 } | 165 } |
| 166 | 166 |
| 167 } // namespace app_list | 167 } // namespace app_list |
| OLD | NEW |