From a080d2c5bbeaa72f157b6ff3d44cf2e5a3241b73 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 11 Jul 2014 23:32:00 +0800 Subject: [PATCH] Remove GetNativeView() when compiled with views toolkit. --- brightray/browser/inspectable_web_contents_view.h | 3 ++- .../browser/views/inspectable_web_contents_view_views.cc | 6 ------ .../browser/views/inspectable_web_contents_view_views.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/brightray/browser/inspectable_web_contents_view.h b/brightray/browser/inspectable_web_contents_view.h index a79205b117..1675ec7368 100644 --- a/brightray/browser/inspectable_web_contents_view.h +++ b/brightray/browser/inspectable_web_contents_view.h @@ -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; diff --git a/brightray/browser/views/inspectable_web_contents_view_views.cc b/brightray/browser/views/inspectable_web_contents_view_views.cc index 95cf85eda8..46c337515c 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.cc +++ b/brightray/browser/views/inspectable_web_contents_view_views.cc @@ -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; diff --git a/brightray/browser/views/inspectable_web_contents_view_views.h b/brightray/browser/views/inspectable_web_contents_view_views.h index 319f1bd6c0..4875980a38 100644 --- a/brightray/browser/views/inspectable_web_contents_view_views.h +++ b/brightray/browser/views/inspectable_web_contents_view_views.h @@ -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;