OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/renderer/render_thread.h" | 5 #include "chrome/renderer/render_thread.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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
905 WebRuntimeFeatures::enableWebGL( | 905 WebRuntimeFeatures::enableWebGL( |
906 command_line.HasSwitch(switches::kEnableExperimentalWebGL)); | 906 command_line.HasSwitch(switches::kEnableExperimentalWebGL)); |
907 | 907 |
908 WebRuntimeFeatures::enablePushState(true); | 908 WebRuntimeFeatures::enablePushState(true); |
909 | 909 |
910 WebRuntimeFeatures::enableTouch( | 910 WebRuntimeFeatures::enableTouch( |
911 command_line.HasSwitch(switches::kEnableTouch)); | 911 command_line.HasSwitch(switches::kEnableTouch)); |
912 | 912 |
913 WebRuntimeFeatures::enableDeviceOrientation( | 913 WebRuntimeFeatures::enableDeviceOrientation( |
914 command_line.HasSwitch(switches::kEnableDeviceOrientation)); | 914 command_line.HasSwitch(switches::kEnableDeviceOrientation)); |
| 915 |
| 916 WebRuntimeFeatures::enableSpeechInput( |
| 917 command_line.HasSwitch(switches::kEnableSpeechInput)); |
915 } | 918 } |
916 | 919 |
917 void RenderThread::IdleHandler() { | 920 void RenderThread::IdleHandler() { |
918 #if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC) | 921 #if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC) |
919 MallocExtension::instance()->ReleaseFreeMemory(); | 922 MallocExtension::instance()->ReleaseFreeMemory(); |
920 #endif | 923 #endif |
921 | 924 |
922 v8::V8::IdleNotification(); | 925 v8::V8::IdleNotification(); |
923 | 926 |
924 // Schedule next invocation. | 927 // Schedule next invocation. |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1060 } | 1063 } |
1061 | 1064 |
1062 std::string RenderThread::GetExtensionIdByBrowseExtent(const GURL& url) { | 1065 std::string RenderThread::GetExtensionIdByBrowseExtent(const GURL& url) { |
1063 for (size_t i = 0; i < extension_extents_.size(); ++i) { | 1066 for (size_t i = 0; i < extension_extents_.size(); ++i) { |
1064 if (extension_extents_[i].browse_extent.ContainsURL(url)) | 1067 if (extension_extents_[i].browse_extent.ContainsURL(url)) |
1065 return extension_extents_[i].extension_id; | 1068 return extension_extents_[i].extension_id; |
1066 } | 1069 } |
1067 | 1070 |
1068 return std::string(); | 1071 return std::string(); |
1069 } | 1072 } |
OLD | NEW |