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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 260903010: Start removing support for the experimental x-webkit-speech API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't touch histograms.xml Created 6 years, 7 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 (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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 #endif 208 #endif
209 209
210 #if !defined(OS_ANDROID) 210 #if !defined(OS_ANDROID)
211 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" 211 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
212 #endif 212 #endif
213 213
214 #if defined(ENABLE_WEBRTC) 214 #if defined(ENABLE_WEBRTC)
215 #include "chrome/browser/media/webrtc_logging_handler_host.h" 215 #include "chrome/browser/media/webrtc_logging_handler_host.h"
216 #endif 216 #endif
217 217
218 #if defined(ENABLE_INPUT_SPEECH)
219 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h"
220 #endif
221
222 #if defined(OS_CHROMEOS) 218 #if defined(OS_CHROMEOS)
223 #include "chrome/browser/chromeos/file_manager/app_id.h" 219 #include "chrome/browser/chromeos/file_manager/app_id.h"
224 #endif 220 #endif
225 221
226 #if defined(TOOLKIT_VIEWS) 222 #if defined(TOOLKIT_VIEWS)
227 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 223 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
228 #endif 224 #endif
229 225
230 #if defined(USE_ASH) 226 #if defined(USE_ASH)
231 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 227 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
(...skipping 1929 matching lines...) Expand 10 before | Expand all | Expand 10 after
2161 return extension ? extension->name() : std::string(); 2157 return extension ? extension->name() : std::string();
2162 } 2158 }
2163 2159
2164 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { 2160 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
2165 return g_browser_process->ResourceDispatcherHostCreated(); 2161 return g_browser_process->ResourceDispatcherHostCreated();
2166 } 2162 }
2167 2163
2168 // TODO(tommi): Rename from Get to Create. 2164 // TODO(tommi): Rename from Get to Create.
2169 content::SpeechRecognitionManagerDelegate* 2165 content::SpeechRecognitionManagerDelegate*
2170 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() { 2166 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
2171 #if defined(ENABLE_INPUT_SPEECH)
2172 return new speech::ChromeSpeechRecognitionManagerDelegateBubbleUI();
2173 #else
2174 // Platforms who don't implement x-webkit-speech (a.k.a INPUT_SPEECH) just
2175 // need the base delegate without the bubble UI.
2176 return new speech::ChromeSpeechRecognitionManagerDelegate(); 2167 return new speech::ChromeSpeechRecognitionManagerDelegate();
2177 #endif
2178 } 2168 }
2179 2169
2180 net::NetLog* ChromeContentBrowserClient::GetNetLog() { 2170 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
2181 return g_browser_process->net_log(); 2171 return g_browser_process->net_log();
2182 } 2172 }
2183 2173
2184 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { 2174 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() {
2185 return new ChromeAccessTokenStore(); 2175 return new ChromeAccessTokenStore();
2186 } 2176 }
2187 2177
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
2672 switches::kDisableWebRtcEncryption, 2662 switches::kDisableWebRtcEncryption,
2673 }; 2663 };
2674 to_command_line->CopySwitchesFrom(from_command_line, 2664 to_command_line->CopySwitchesFrom(from_command_line,
2675 kWebRtcDevSwitchNames, 2665 kWebRtcDevSwitchNames,
2676 arraysize(kWebRtcDevSwitchNames)); 2666 arraysize(kWebRtcDevSwitchNames));
2677 } 2667 }
2678 } 2668 }
2679 #endif // defined(ENABLE_WEBRTC) 2669 #endif // defined(ENABLE_WEBRTC)
2680 2670
2681 } // namespace chrome 2671 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/renderer_context_menu/render_view_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698