Remove overlayScrollbars and sharedWorker options

They are already enabled by default.

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
index 382c289..0c20551 100644 (file)
--- a/atom/browser/web_contents_preferences.cc
+++ b/atom/browser/web_contents_preferences.cc
@@ -34,10 +34,6 @@ FeaturePair kWebRuntimeFeatures[] = {
     switches::kExperimentalFeatures },
   { options::kExperimentalCanvasFeatures,
     switches::kExperimentalCanvasFeatures },
-  { options::kOverlayScrollbars,
-    switches::kOverlayScrollbars },
-  { options::kSharedWorker,
-    switches::kSharedWorker },
   { options::kPageVisibility,
     switches::kPageVisibility },
 };

diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 6a3490f..b87f10a 100644 (file)
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -97,8 +97,6 @@ const char kOpenerID[] = "openerId";
 // Web runtime features.
 const char kExperimentalFeatures[]       = "experimentalFeatures";
 const char kExperimentalCanvasFeatures[] = "experimentalCanvasFeatures";
-const char kOverlayScrollbars[]          = "overlayScrollbars";
-const char kSharedWorker[]               = "sharedWorker";
 
 }  // namespace options
 
@@ -143,8 +141,6 @@ const char kNodeIntegration[]            = "node-integration";
 const char kGuestInstanceID[]            = "guest-instance-id";
 const char kExperimentalFeatures[]       = "experimental-features";
 const char kExperimentalCanvasFeatures[] = "experimental-canvas-features";
-const char kOverlayScrollbars[]          = "overlay-scrollbars";
-const char kSharedWorker[]               = "shared-worker";
 const char kPageVisibility[]             = "page-visiblity";
 const char kOpenerID[]                   = "opener-id";
 

diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index 1612444..7052acb 100644 (file)
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -49,8 +49,6 @@ extern const char kNodeIntegration[];
 extern const char kGuestInstanceID[];
 extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
-extern const char kOverlayScrollbars[];
-extern const char kSharedWorker[];
 extern const char kPageVisibility[];
 extern const char kOpenerID[];
 
@@ -79,8 +77,6 @@ extern const char kNodeIntegration[];
 extern const char kGuestInstanceID[];
 extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
-extern const char kOverlayScrollbars[];
-extern const char kSharedWorker[];
 extern const char kPageVisibility[];
 extern const char kOpenerID[];
 

diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
index 6abe839..bae49bf 100644 (file)
--- a/atom/renderer/atom_renderer_client.cc
+++ b/atom/renderer/atom_renderer_client.cc
@@ -230,10 +230,6 @@ void AtomRendererClient::EnableWebRuntimeFeatures() {
     blink::WebRuntimeFeatures::enableExperimentalFeatures(true);
   if (IsSwitchEnabled(command_line, switches::kExperimentalCanvasFeatures))
     blink::WebRuntimeFeatures::enableExperimentalCanvasFeatures(true);
-  if (IsSwitchEnabled(command_line, switches::kOverlayScrollbars))
-    blink::WebRuntimeFeatures::enableOverlayScrollbars(true);
-  if (IsSwitchEnabled(command_line, switches::kSharedWorker))
-    blink::WebRuntimeFeatures::enableSharedWorker(true);
 }
 
 void AtomRendererClient::AddKeySystems(

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 44c4da5..b6a4631 100644 (file)
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -136,9 +136,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     Default is `false`.
   * `experimentalCanvasFeatures` Boolean - Enables Chromium's experimental
     canvas features. Default is `false`.
-  * `overlayScrollbars` Boolean - Enables overlay scrollbars. Default is
-    `false`.
-  * `sharedWorker` Boolean - Enables Shared Worker support. Default is `false`.
   * `directWrite` Boolean - Enables DirectWrite font rendering system on
      Windows. Default is `true`.
   * `pageVisibility` Boolean - Page would be forced to be always in visible