From 70996c79ba82529cfcf8ef625964737538b42973 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 8 Jun 2016 10:19:28 -0700 Subject: [PATCH] Add showDefinitionForSelection webContents proxy method --- atom/browser/api/atom_api_window.cc | 10 ---------- atom/browser/api/atom_api_window.h | 4 ---- atom/browser/native_window.cc | 4 ---- atom/browser/native_window.h | 3 --- atom/browser/native_window_mac.h | 1 - atom/browser/native_window_mac.mm | 11 ----------- lib/browser/api/browser-window.js | 3 +++ 7 files changed, 3 insertions(+), 33 deletions(-) diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc index ac3c510193ed..c95a43340418 100644 --- a/atom/browser/api/atom_api_window.cc +++ b/atom/browser/api/atom_api_window.cc @@ -623,12 +623,6 @@ void Window::UnhookAllWindowMessages() { } #endif -#if defined(OS_MACOSX) -void Window::ShowDefinitionForSelection() { - window_->ShowDefinitionForSelection(); -} -#endif - #if defined(TOOLKIT_VIEWS) void Window::SetIcon(mate::Handle icon) { #if defined(OS_WIN) @@ -760,10 +754,6 @@ void Window::BuildPrototype(v8::Isolate* isolate, .SetMethod("unhookWindowMessage", &Window::UnhookWindowMessage) .SetMethod("unhookAllWindowMessages", &Window::UnhookAllWindowMessages) #endif -#if defined(OS_MACOSX) - .SetMethod("showDefinitionForSelection", - &Window::ShowDefinitionForSelection) -#endif #if defined(TOOLKIT_VIEWS) .SetMethod("setIcon", &Window::SetIcon) #endif diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h index e698eaaf78cc..23ab162261ff 100644 --- a/atom/browser/api/atom_api_window.h +++ b/atom/browser/api/atom_api_window.h @@ -169,10 +169,6 @@ class Window : public mate::TrackableObject, void UnhookAllWindowMessages(); #endif -#if defined(OS_MACOSX) - void ShowDefinitionForSelection(); -#endif - #if defined(TOOLKIT_VIEWS) void SetIcon(mate::Handle icon); #endif diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 46c3250a94a6..b50de48dc54b 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -334,10 +334,6 @@ void NativeWindow::CapturePage(const gfx::Rect& rect, kBGRA_8888_SkColorType); } -void NativeWindow::ShowDefinitionForSelection() { - NOTIMPLEMENTED(); -} - void NativeWindow::SetAutoHideMenuBar(bool auto_hide) { } diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h index a12663a1aa5a..c7d099fcadf2 100644 --- a/atom/browser/native_window.h +++ b/atom/browser/native_window.h @@ -179,9 +179,6 @@ class NativeWindow : public base::SupportsUserData, virtual void CapturePage(const gfx::Rect& rect, const CapturePageCallback& callback); - // Show popup dictionary. - virtual void ShowDefinitionForSelection(); - // Toggle the menu bar. virtual void SetAutoHideMenuBar(bool auto_hide); virtual bool IsMenuBarAutoHide(); diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h index 52ebcbcb9c51..27857239e8c8 100644 --- a/atom/browser/native_window_mac.h +++ b/atom/browser/native_window_mac.h @@ -83,7 +83,6 @@ class NativeWindowMac : public NativeWindow { void SetProgressBar(double progress) override; void SetOverlayIcon(const gfx::Image& overlay, const std::string& description) override; - void ShowDefinitionForSelection() override; void SetVisibleOnAllWorkspaces(bool visible) override; bool IsVisibleOnAllWorkspaces() override; diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 995031a6f536..73aa3017eb3f 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -933,17 +933,6 @@ void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay, const std::string& description) { } -void NativeWindowMac::ShowDefinitionForSelection() { - // TODO(kevinsawicki): Deprecate and remove this method in 2.0 in favor of - // calling it directly on webContents. - if (!web_contents()) - return; - auto rwhv = web_contents()->GetRenderWidgetHostView(); - if (!rwhv) - return; - rwhv->ShowDefinitionForSelection(); -} - void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) { SetCollectionBehavior(visible, NSWindowCollectionBehaviorCanJoinAllSpaces); } diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js index ec61229368d1..6ac31e737b8c 100644 --- a/lib/browser/api/browser-window.js +++ b/lib/browser/api/browser-window.js @@ -151,6 +151,9 @@ Object.assign(BrowserWindow.prototype, { }, inspectServiceWorker () { return this.webContents.inspectServiceWorker() + }, + showDefinitionForSelection () { + return this.webContents.showDefinitionForSelection() } })