github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-28 00:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove GetNativeView() when compiled with views toolkit.

Browse Source
This commit is contained in:
Cheng Zhao
2014-07-11 23:32:00 +08:00
parent 4b57e1f4f8
commit a080d2c5bb
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
brightray/browser/inspectable_web_contents_view.h
View File

@@ -24,9 +24,10 @@ class InspectableWebContentsView {
// Returns the web view control, which can be used by the
// GetInitiallyFocusedView() to set initial focus to web view.
virtual views::View* GetWebView() = 0;
#else
virtual gfx::NativeView GetNativeView() const = 0;
#endif
virtual gfx::NativeView GetNativeView() const = 0;
virtual void ShowDevTools() = 0;
// Hide the DevTools view.
virtual void CloseDevTools() = 0;

6
brightray/browser/views/inspectable_web_contents_view_views.cc
View File

@@ -90,12 +90,6 @@ views::View* InspectableWebContentsViewViews::GetWebView() {
return contents_web_view_;
}
gfx::NativeView InspectableWebContentsViewViews::GetNativeView() const {
NOTREACHED() << "GetNativeView() shouldn't be used when having views library, "
"use GetView() instead";
return inspectable_web_contents_->GetWebContents()->GetView()->GetNativeView();
}
void InspectableWebContentsViewViews::ShowDevTools() {
if (devtools_visible_)
return;

1
brightray/browser/views/inspectable_web_contents_view_views.h
View File

@@ -26,7 +26,6 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
// InspectableWebContentsView:
virtual views::View* GetView() OVERRIDE;
virtual views::View* GetWebView() OVERRIDE;
virtual gfx::NativeView GetNativeView() const OVERRIDE;
virtual void ShowDevTools() OVERRIDE;
virtual void CloseDevTools() OVERRIDE;
virtual bool IsDevToolsViewShowing() OVERRIDE;