mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add showDefinitionForSelection webContents proxy method

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-08 10:19:28 -07:00
parent 6337e93e6d
commit 70996c79ba
7 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/api/atom_api_window.cc
View file

@ -623,12 +623,6 @@ void Window::UnhookAllWindowMessages() {
} }
#endif #endif
#if defined(OS_MACOSX)
void Window::ShowDefinitionForSelection() {
window_->ShowDefinitionForSelection();
}
#endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
void Window::SetIcon(mate::Handle<NativeImage> icon) { void Window::SetIcon(mate::Handle<NativeImage> icon) {
#if defined(OS_WIN) #if defined(OS_WIN)
@ -760,10 +754,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("unhookWindowMessage", &Window::UnhookWindowMessage) .SetMethod("unhookWindowMessage", &Window::UnhookWindowMessage)
.SetMethod("unhookAllWindowMessages", &Window::UnhookAllWindowMessages) .SetMethod("unhookAllWindowMessages", &Window::UnhookAllWindowMessages)
#endif #endif
#if defined(OS_MACOSX)
.SetMethod("showDefinitionForSelection",
&Window::ShowDefinitionForSelection)
#endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
.SetMethod("setIcon", &Window::SetIcon) .SetMethod("setIcon", &Window::SetIcon)
#endif #endif

4
atom/browser/api/atom_api_window.h
View file

@ -169,10 +169,6 @@ class Window : public mate::TrackableObject<Window>,
void UnhookAllWindowMessages(); void UnhookAllWindowMessages();
#endif #endif
#if defined(OS_MACOSX)
void ShowDefinitionForSelection();
#endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
void SetIcon(mate::Handle<NativeImage> icon); void SetIcon(mate::Handle<NativeImage> icon);
#endif #endif

4
atom/browser/native_window.cc
View file

@ -334,10 +334,6 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
kBGRA_8888_SkColorType); kBGRA_8888_SkColorType);
} }
void NativeWindow::ShowDefinitionForSelection() {
NOTIMPLEMENTED();
}
void NativeWindow::SetAutoHideMenuBar(bool auto_hide) { void NativeWindow::SetAutoHideMenuBar(bool auto_hide) {
} }

3
atom/browser/native_window.h
View file

@ -179,9 +179,6 @@ class NativeWindow : public base::SupportsUserData,
virtual void CapturePage(const gfx::Rect& rect, virtual void CapturePage(const gfx::Rect& rect,
const CapturePageCallback& callback); const CapturePageCallback& callback);
// Show popup dictionary.
virtual void ShowDefinitionForSelection();
// Toggle the menu bar. // Toggle the menu bar.
virtual void SetAutoHideMenuBar(bool auto_hide); virtual void SetAutoHideMenuBar(bool auto_hide);
virtual bool IsMenuBarAutoHide(); virtual bool IsMenuBarAutoHide();

1
atom/browser/native_window_mac.h
View file

@ -83,7 +83,6 @@ class NativeWindowMac : public NativeWindow {
void SetProgressBar(double progress) override; void SetProgressBar(double progress) override;
void SetOverlayIcon(const gfx::Image& overlay, void SetOverlayIcon(const gfx::Image& overlay,
const std::string& description) override; const std::string& description) override;
void ShowDefinitionForSelection() override;
void SetVisibleOnAllWorkspaces(bool visible) override; void SetVisibleOnAllWorkspaces(bool visible) override;
bool IsVisibleOnAllWorkspaces() override; bool IsVisibleOnAllWorkspaces() override;

11
atom/browser/native_window_mac.mm
View file

@ -933,17 +933,6 @@ void NativeWindowMac::SetOverlayIcon(const gfx::Image& overlay,
const std::string& description) { 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) { void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible) {
SetCollectionBehavior(visible, NSWindowCollectionBehaviorCanJoinAllSpaces); SetCollectionBehavior(visible, NSWindowCollectionBehaviorCanJoinAllSpaces);
} }

3
lib/browser/api/browser-window.js
View file

@ -151,6 +151,9 @@ Object.assign(BrowserWindow.prototype, {
}, },
inspectServiceWorker () { inspectServiceWorker () {
return this.webContents.inspectServiceWorker() return this.webContents.inspectServiceWorker()
},
showDefinitionForSelection () {
return this.webContents.showDefinitionForSelection()
} }
}) })