diff --git a/brightray/browser/inspectable_web_contents.h b/brightray/browser/inspectable_web_contents.h index 04ba87bf0df0..49a50bc5079b 100644 --- a/brightray/browser/inspectable_web_contents.h +++ b/brightray/browser/inspectable_web_contents.h @@ -22,7 +22,7 @@ class InspectableWebContents { virtual content::WebContents* GetWebContents() const = 0; virtual void ShowDevTools() = 0; - virtual bool IsDevToolsOpened() = 0; + virtual bool IsDevToolsViewShowing() = 0; }; } // namespace brightray diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 0b194e70e612..e972e568735c 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -96,8 +96,8 @@ void InspectableWebContentsImpl::ShowDevTools() { view_->ShowDevTools(); } -bool InspectableWebContentsImpl::IsDevToolsOpened() { - return devtools_web_contents_ && view_->IsDevToolsOpened(); +bool InspectableWebContentsImpl::IsDevToolsViewShowing() { + return devtools_web_contents_ && view_->IsDevToolsViewShowing(); } void InspectableWebContentsImpl::UpdateFrontendDockSide() { diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index f0a55f5dac5d..53023204dd13 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -41,7 +41,7 @@ class InspectableWebContentsImpl : virtual content::WebContents* GetWebContents() const OVERRIDE; virtual void ShowDevTools() OVERRIDE; - virtual bool IsDevToolsOpened() OVERRIDE; + virtual bool IsDevToolsViewShowing() OVERRIDE; content::WebContents* devtools_web_contents() { return devtools_web_contents_.get(); diff --git a/brightray/browser/inspectable_web_contents_view.h b/brightray/browser/inspectable_web_contents_view.h index ff71bac783ba..87274805f8e0 100644 --- a/brightray/browser/inspectable_web_contents_view.h +++ b/brightray/browser/inspectable_web_contents_view.h @@ -13,7 +13,7 @@ class InspectableWebContentsView { virtual void ShowDevTools() = 0; virtual void CloseDevTools() = 0; - virtual bool IsDevToolsOpened() = 0; + virtual bool IsDevToolsViewShowing() = 0; virtual bool SetDockSide(const std::string& side) = 0; }; diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h index 4390db290f8c..86cc78221784 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.h +++ b/brightray/browser/inspectable_web_contents_view_mac.h @@ -19,7 +19,7 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView { virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual void ShowDevTools() OVERRIDE; virtual void CloseDevTools() OVERRIDE; - virtual bool IsDevToolsOpened() OVERRIDE; + virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool SetDockSide(const std::string& side) OVERRIDE; InspectableWebContentsImpl* inspectable_web_contents() { diff --git a/brightray/browser/inspectable_web_contents_view_mac.mm b/brightray/browser/inspectable_web_contents_view_mac.mm index adde9b05033a..95ed74f2dbdb 100644 --- a/brightray/browser/inspectable_web_contents_view_mac.mm +++ b/brightray/browser/inspectable_web_contents_view_mac.mm @@ -29,7 +29,7 @@ void InspectableWebContentsViewMac::CloseDevTools() { [view_ setDevToolsVisible:NO]; } -bool InspectableWebContentsViewMac::IsDevToolsOpened() { +bool InspectableWebContentsViewMac::IsDevToolsViewShowing() { return [view_ isDevToolsVisible]; } diff --git a/brightray/browser/linux/inspectable_web_contents_view_linux.cc b/brightray/browser/linux/inspectable_web_contents_view_linux.cc index 365a053e7709..58d7507fb439 100644 --- a/brightray/browser/linux/inspectable_web_contents_view_linux.cc +++ b/brightray/browser/linux/inspectable_web_contents_view_linux.cc @@ -166,7 +166,7 @@ void InspectableWebContentsViewLinux::CloseDevTools() { } } -bool InspectableWebContentsViewLinux::IsDevToolsOpened() { +bool InspectableWebContentsViewLinux::IsDevToolsViewShowing() { auto devtools_web_contents = inspectable_web_contents()->devtools_web_contents(); GtkWidget* devtools = devtools_web_contents->GetView()->GetNativeView(); diff --git a/brightray/browser/linux/inspectable_web_contents_view_linux.h b/brightray/browser/linux/inspectable_web_contents_view_linux.h index 79ab6f731d5c..0a8022390056 100644 --- a/brightray/browser/linux/inspectable_web_contents_view_linux.h +++ b/brightray/browser/linux/inspectable_web_contents_view_linux.h @@ -18,7 +18,7 @@ class InspectableWebContentsViewLinux : public InspectableWebContentsView { virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual void ShowDevTools() OVERRIDE; virtual void CloseDevTools() OVERRIDE; - virtual bool IsDevToolsOpened() OVERRIDE; + virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool SetDockSide(const std::string& side) OVERRIDE; InspectableWebContentsImpl* inspectable_web_contents() { diff --git a/brightray/browser/win/inspectable_web_contents_view_win.cc b/brightray/browser/win/inspectable_web_contents_view_win.cc index d1530d1cee90..dca7ba4f3ebd 100644 --- a/brightray/browser/win/inspectable_web_contents_view_win.cc +++ b/brightray/browser/win/inspectable_web_contents_view_win.cc @@ -57,7 +57,7 @@ void InspectableWebContentsViewWin::CloseDevTools() { SendMessage(devtools_window_->hwnd(), WM_CLOSE, 0, 0); } -bool InspectableWebContentsViewWin::IsDevToolsOpened() { +bool InspectableWebContentsViewWin::IsDevToolsViewShowing() { return devtools_window_; } diff --git a/brightray/browser/win/inspectable_web_contents_view_win.h b/brightray/browser/win/inspectable_web_contents_view_win.h index f79ce30bf3de..55b09b2d3e4c 100644 --- a/brightray/browser/win/inspectable_web_contents_view_win.h +++ b/brightray/browser/win/inspectable_web_contents_view_win.h @@ -20,7 +20,7 @@ class InspectableWebContentsViewWin : public InspectableWebContentsView { virtual gfx::NativeView GetNativeView() const OVERRIDE; virtual void ShowDevTools() OVERRIDE; virtual void CloseDevTools() OVERRIDE; - virtual bool IsDevToolsOpened() OVERRIDE; + virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool SetDockSide(const std::string& side) OVERRIDE; InspectableWebContentsImpl* inspectable_web_contents() {