diff options
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 | ||||
| -rw-r--r-- | content/child/runtime_features.cc | 3 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 3 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/test/test_webkit_platform_support.cc | 4 |
5 files changed, 0 insertions, 12 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index b91e022..61ee274 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -982,7 +982,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableFileSystem, switches::kDisableFiltersOverIPC, switches::kDisableFullScreen, - switches::kDisableGeolocation, switches::kDisableGpu, switches::kDisableGpuCompositing, switches::kDisableGpuVsync, diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc index 8fb6877..fc5fea7 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc @@ -75,9 +75,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( if (command_line.HasSwitch(switches::kDisableSessionStorage)) WebRuntimeFeatures::enableSessionStorage(false); - if (command_line.HasSwitch(switches::kDisableGeolocation)) - WebRuntimeFeatures::enableGeolocation(false); - if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) WebRuntimeFeatures::enableWebKitMediaSource(false); diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 9108a4b..0c1336c 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -200,9 +200,6 @@ const char kDisableForceCompositingMode[] = "disable-force-compositing-mode"; // Disable the JavaScript Full Screen API. const char kDisableFullScreen[] = "disable-fullscreen"; -// Suppresses support for the Geolocation javascript API. -const char kDisableGeolocation[] = "disable-geolocation"; - // Disable deferral of scroll-ending gesture events when a scroll is active. const char kDisableGestureDebounce[] = "disable-gesture-debounce"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index 69cfd6c..568b3ba 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -67,7 +67,6 @@ CONTENT_EXPORT extern const char kDisableFlash3d[]; CONTENT_EXPORT extern const char kDisableFlashStage3d[]; CONTENT_EXPORT extern const char kDisableForceCompositingMode[]; CONTENT_EXPORT extern const char kDisableFullScreen[]; -extern const char kDisableGeolocation[]; extern const char kDisableGestureDebounce[]; CONTENT_EXPORT extern const char kDisableGestureTapHighlight[]; CONTENT_EXPORT extern const char kDisableGLMultisampling[]; diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc index 3c46b66..dedad35 100644 --- a/content/test/test_webkit_platform_support.cc +++ b/content/test/test_webkit_platform_support.cc @@ -80,10 +80,6 @@ TestWebKitPlatformSupport::TestWebKitPlatformSupport() { blink::WebRuntimeFeatures::enableMediaPlayer(enable_media); LOG_IF(WARNING, !enable_media) << "Failed to initialize the media library.\n"; - // TODO(joth): Make a dummy geolocation service implemenation for - // test_shell, and set this to true. http://crbug.com/36451 - blink::WebRuntimeFeatures::enableGeolocation(false); - file_utilities_.set_sandbox_enabled(false); if (!file_system_root_.CreateUniqueTempDir()) { |