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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 11970005: Web Speech API: Don't expose the API on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | no next file » | 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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 685
686 WebRuntimeFeatures::enableDeviceMotion( 686 WebRuntimeFeatures::enableDeviceMotion(
687 command_line.HasSwitch(switches::kEnableDeviceMotion)); 687 command_line.HasSwitch(switches::kEnableDeviceMotion));
688 688
689 WebRuntimeFeatures::enableDeviceOrientation( 689 WebRuntimeFeatures::enableDeviceOrientation(
690 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); 690 !command_line.HasSwitch(switches::kDisableDeviceOrientation));
691 691
692 WebRuntimeFeatures::enableSpeechInput( 692 WebRuntimeFeatures::enableSpeechInput(
693 !command_line.HasSwitch(switches::kDisableSpeechInput)); 693 !command_line.HasSwitch(switches::kDisableSpeechInput));
694 694
695 #if defined(OS_ANDROID)
696 // Web Speech API Speech recognition is not implemented on Android yet.
697 WebRuntimeFeatures::enableScriptedSpeech(false);
698 #else
695 WebRuntimeFeatures::enableScriptedSpeech(true); 699 WebRuntimeFeatures::enableScriptedSpeech(true);
700 #endif
696 701
697 WebRuntimeFeatures::enableFileSystem( 702 WebRuntimeFeatures::enableFileSystem(
698 !command_line.HasSwitch(switches::kDisableFileSystem)); 703 !command_line.HasSwitch(switches::kDisableFileSystem));
699 704
700 WebRuntimeFeatures::enableJavaScriptI18NAPI( 705 WebRuntimeFeatures::enableJavaScriptI18NAPI(
701 !command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI)); 706 !command_line.HasSwitch(switches::kDisableJavaScriptI18NAPI));
702 707
703 WebRuntimeFeatures::enableGamepad(true); 708 WebRuntimeFeatures::enableGamepad(true);
704 709
705 WebRuntimeFeatures::enableQuota(true); 710 WebRuntimeFeatures::enableQuota(true);
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1159 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
1155 DCHECK(message_loop() == MessageLoop::current()); 1160 DCHECK(message_loop() == MessageLoop::current());
1156 if (!file_thread_.get()) { 1161 if (!file_thread_.get()) {
1157 file_thread_.reset(new base::Thread("Renderer::FILE")); 1162 file_thread_.reset(new base::Thread("Renderer::FILE"));
1158 file_thread_->Start(); 1163 file_thread_->Start();
1159 } 1164 }
1160 return file_thread_->message_loop_proxy(); 1165 return file_thread_->message_loop_proxy();
1161 } 1166 }
1162 1167
1163 } // namespace content 1168 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698