electron · ckerr · May 30, 2018 · May 23, 2018 · May 23, 2018 · May 23, 2018
diff --git a/atom/browser/api/atom_api_screen.cc b/atom/browser/api/atom_api_screen.cc
@@ -145,9 +145,6 @@ void Screen::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("dipToScreenPoint", &display::win::ScreenWin::DIPToScreenPoint)
       .SetMethod("screenToDipRect", &ScreenToDIPRect)
       .SetMethod("dipToScreenRect", &DIPToScreenRect)
-#endif
-#if defined(OS_MACOSX)
-      .SetMethod("getMenuBarHeight", &Screen::getMenuBarHeight)
 #endif
       .SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
 }

diff --git a/atom/browser/api/atom_api_screen.h b/atom/browser/api/atom_api_screen.h
@@ -40,10 +40,6 @@ class Screen : public mate::EventEmitter<Screen>,
   display::Display GetDisplayNearestPoint(const gfx::Point& point);
   display::Display GetDisplayMatching(const gfx::Rect& match_rect);
 
-#if defined(OS_MACOSX)
-  int getMenuBarHeight();
-#endif
-
   // display::DisplayObserver:
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;

diff --git a/atom/browser/api/atom_api_screen_mac.mm b/atom/browser/api/atom_api_screen_mac.mm
diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
@@ -821,7 +821,7 @@ void Session::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setDownloadPath", &Session::SetDownloadPath)
       .SetMethod("enableNetworkEmulation", &Session::EnableNetworkEmulation)
       .SetMethod("disableNetworkEmulation", &Session::DisableNetworkEmulation)
-      .SetMethod("_setCertificateVerifyProc", &Session::SetCertVerifyProc)
+      .SetMethod("setCertificateVerifyProc", &Session::SetCertVerifyProc)
       .SetMethod("setPermissionRequestHandler",
                  &Session::SetPermissionRequestHandler)
       .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)

diff --git a/atom/browser/api/atom_api_tray.cc b/atom/browser/api/atom_api_tray.cc
@@ -40,16 +40,6 @@ struct Converter<atom::TrayIcon::HighlightMode> {
         return true;
       }
     }
-
-    bool highlight;
-    if (ConvertFromV8(isolate, val, &highlight)) {
-      if (highlight)
-        *out = atom::TrayIcon::HighlightMode::SELECTION;
-      else
-        *out = atom::TrayIcon::HighlightMode::NEVER;
-      return true;
-    }
-
     return false;
   }
 };

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
@@ -1296,15 +1296,9 @@ void WebContents::OpenDevTools(mate::Arguments* args) {
     state = "detach";
   }
   if (args && args->Length() == 1) {
-    bool detach = false;
     mate::Dictionary options;
     if (args->GetNext(&options)) {
       options.Get("mode", &state);
-
-      // TODO(kevinsawicki) Remove in 2.0
-      options.Get("detach", &detach);
-      if (state.empty() && detach)
-        state = "detach";
     }
   }
   managed_web_contents()->SetDockState(state);

diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
@@ -143,10 +143,6 @@ bool NativeWindowViews::ExecuteWindowsCommand(int command_id) {
   std::string command = AppCommandToString(command_id);
   NotifyWindowExecuteWindowsCommand(command);
 
-  if (command_id == APPCOMMAND_MEDIA_PLAY_PAUSE)
-    // FIXME(htk3): Remove media-play_pause in 3.0
-    NotifyWindowExecuteWindowsCommand("media-play_pause");
-
   return false;
 }
 

diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
@@ -231,7 +231,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
   }
 
   // Enable blink features.
-  if (dict_.GetString(options::kBlinkFeatures, &s))
+  if (dict_.GetString(options::kEnableBlinkFeatures, &s))
     command_line->AppendSwitchASCII(::switches::kEnableBlinkFeatures, s);
 
   // Disable blink features.

diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc
@@ -517,9 +517,6 @@ mate::Handle<NativeImage> NativeImage::CreateFromBuffer(
     options.Get("width", &width);
     options.Get("height", &height);
     options.Get("scaleFactor", &scale_factor);
-  } else {
-    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
-    args->GetNext(&scale_factor);
   }
 
   gfx::ImageSkia image_skia;

diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
@@ -127,8 +127,7 @@ const char kOpenerID[] = "openerId";
 const char kScrollBounce[] = "scrollBounce";
 
 // Enable blink features.
-// TODO(kevinsawicki) Rename to enableBlinkFeatures in 2.0
-const char kBlinkFeatures[] = "blinkFeatures";
+const char kEnableBlinkFeatures[] = "enableBlinkFeatures";
 
 // Disable blink features.
 const char kDisableBlinkFeatures[] = "disableBlinkFeatures";

diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
@@ -64,7 +64,7 @@ extern const char kExperimentalFeatures[];
 extern const char kExperimentalCanvasFeatures[];
 extern const char kOpenerID[];
 extern const char kScrollBounce[];
-extern const char kBlinkFeatures[];
+extern const char kEnableBlinkFeatures[];
 extern const char kDisableBlinkFeatures[];
 extern const char kNodeIntegrationInWorker[];
 extern const char kWebviewTag[];

diff --git a/atom/renderer/api/atom_api_web_frame.cc b/atom/renderer/api/atom_api_web_frame.cc
@@ -206,12 +206,6 @@ void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
   web_frame_->SetSpellCheckPanelHostClient(spell_check_client_.get());
 }
 
-void WebFrame::RegisterURLSchemeAsSecure(const std::string& scheme) {
-  // TODO(pfrazee): Remove 2.0
-  blink::SchemeRegistry::RegisterURLSchemeAsSecure(
-      WTF::String::FromUTF8(scheme.data(), scheme.length()));
-}
-
 void WebFrame::RegisterURLSchemeAsBypassingCSP(const std::string& scheme) {
   // Register scheme to bypass pages's Content Security Policy.
   blink::SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
@@ -243,10 +237,6 @@ void WebFrame::RegisterURLSchemeAsPrivileged(const std::string& scheme,
   // Register scheme to privileged list (https, wss, data, chrome-extension)
   WTF::String privileged_scheme(
       WTF::String::FromUTF8(scheme.data(), scheme.length()));
-  if (secure) {
-    // TODO(pfrazee): Remove 2.0
-    blink::SchemeRegistry::RegisterURLSchemeAsSecure(privileged_scheme);
-  }
   if (bypassCSP) {
     blink::SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
         privileged_scheme);
@@ -442,13 +432,13 @@ v8::Local<v8::Value> WebFrame::FindFrameByName(const std::string& name) const {
 
 v8::Local<v8::Value> WebFrame::FindFrameByRoutingId(int routing_id) const {
   content::RenderFrame* render_frame =
-    content::RenderFrame::FromRoutingID(routing_id);
+      content::RenderFrame::FromRoutingID(routing_id);
   blink::WebLocalFrame* local_frame = nullptr;
   if (render_frame)
     local_frame = render_frame->GetWebFrame();
   if (local_frame)
-    return mate::CreateHandle(isolate(),
-                              new WebFrame(isolate(), local_frame)).ToV8();
+    return mate::CreateHandle(isolate(), new WebFrame(isolate(), local_frame))
+        .ToV8();
   else
     return v8::Null(isolate());
 }
@@ -479,8 +469,6 @@ void WebFrame::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("attachGuest", &WebFrame::AttachGuest)
       .SetMethod("detachGuest", &WebFrame::DetachGuest)
       .SetMethod("setSpellCheckProvider", &WebFrame::SetSpellCheckProvider)
-      .SetMethod("registerURLSchemeAsSecure",
-                 &WebFrame::RegisterURLSchemeAsSecure)
       .SetMethod("registerURLSchemeAsBypassingCSP",
                  &WebFrame::RegisterURLSchemeAsBypassingCSP)
       .SetMethod("registerURLSchemeAsPrivileged",

diff --git a/atom/renderer/api/atom_api_web_frame.h b/atom/renderer/api/atom_api_web_frame.h
@@ -66,7 +66,6 @@ class WebFrame : public mate::Wrappable<WebFrame> {
                              bool auto_spell_correct_turned_on,
                              v8::Local<v8::Object> provider);
 
-  void RegisterURLSchemeAsSecure(const std::string& scheme);
   void RegisterURLSchemeAsBypassingCSP(const std::string& scheme);
   void RegisterURLSchemeAsPrivileged(const std::string& scheme,
                                      mate::Arguments* args);

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
@@ -309,7 +309,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       canvas features. Default is `false`.
     * `scrollBounce` Boolean (optional) - Enables scroll bounce (rubber banding) effect on
       macOS. Default is `false`.
-    * `blinkFeatures` String (optional) - A list of feature strings separated by `,`, like
+    * `enableBlinkFeatures` String (optional) - A list of feature strings separated by `,`, like
       `CSSVariables,KeyboardEventKey` to enable. The full list of supported feature
       strings can be found in the [RuntimeEnabledFeatures.json5][runtime-enabled-features]
       file.

diff --git a/docs/api/screen.md b/docs/api/screen.md
@@ -95,10 +95,6 @@ Returns [`Point`](structures/point.md)
 
 The current absolute position of the mouse pointer.
 
-### `screen.getMenuBarHeight()` _macOS_
-
-Returns `Integer` - The height of the menu bar in pixels.
-
 ### `screen.getPrimaryDisplay()`
 
 Returns [`Display`](structures/display.md) - The primary display.

diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
@@ -81,16 +81,6 @@ webFrame.setSpellCheckProvider('en-US', true, {
 })
 ```
 
-### `webFrame.registerURLSchemeAsSecure(scheme)`
-
-* `scheme` String
-
-Registers the `scheme` as secure scheme.
-
-Secure schemes do not trigger mixed content warnings. For example, `https` and
-`data` are secure schemes because they cannot be corrupted by active network
-attackers.
-
 ### `webFrame.registerURLSchemeAsBypassingCSP(scheme)`
 
 * `scheme` String

diff --git a/docs/api/webview-tag.md b/docs/api/webview-tag.md
@@ -214,10 +214,10 @@ A name by itself is given a `true` boolean value.
 A preference can be set to another value by including an `=`, followed by the value.
 Special values `yes` and `1` are interpreted as `true`, while `no` and `0` are interpreted as `false`.
 
-### `blinkfeatures`
+### `enableblinkfeatures`
 
 ```html
-<webview src="https://www.github.com/" blinkfeatures="PreciseMemoryInfo, CSSVariables"></webview>
+<webview src="https://www.github.com/" enableblinkfeatures="PreciseMemoryInfo, CSSVariables"></webview>
 ```
 
 A list of strings which specifies the blink features to be enabled separated by `,`.