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

Provide a way to close devtools completely.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-20 09:26:21 +08:00
parent 5768ff6981
commit d2ff5ad798
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/inspectable_web_contents.h
View file

@ -23,6 +23,8 @@ class InspectableWebContents {
virtual content::WebContents* GetWebContents() const = 0; virtual content::WebContents* GetWebContents() const = 0;
virtual void ShowDevTools() = 0; virtual void ShowDevTools() = 0;
// Close the DevTools completely instead of just hide it.
virtual void CloseDevTools() = 0;
virtual bool IsDevToolsViewShowing() = 0; virtual bool IsDevToolsViewShowing() = 0;
// The delegate manages its own life. // The delegate manages its own life.

12
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -101,6 +101,14 @@ void InspectableWebContentsImpl::ShowDevTools() {
view_->ShowDevTools(); view_->ShowDevTools();
} }
void InspectableWebContentsImpl::CloseDevTools() {
if (IsDevToolsViewShowing()) {
view_->CloseDevTools();
devtools_web_contents_.reset();
web_contents_->GetView()->Focus();
}
}
bool InspectableWebContentsImpl::IsDevToolsViewShowing() { bool InspectableWebContentsImpl::IsDevToolsViewShowing() {
return devtools_web_contents_ && view_->IsDevToolsViewShowing(); return devtools_web_contents_ && view_->IsDevToolsViewShowing();
} }
@ -116,9 +124,7 @@ void InspectableWebContentsImpl::ActivateWindow() {
} }
void InspectableWebContentsImpl::CloseWindow() { void InspectableWebContentsImpl::CloseWindow() {
view_->CloseDevTools(); CloseDevTools();
devtools_web_contents_.reset();
web_contents_->GetView()->Focus();
} }
void InspectableWebContentsImpl::MoveWindow(int x, int y) { void InspectableWebContentsImpl::MoveWindow(int x, int y) {

1
brightray/browser/inspectable_web_contents_impl.h
View file

@ -42,6 +42,7 @@ class InspectableWebContentsImpl :
virtual content::WebContents* GetWebContents() const OVERRIDE; virtual content::WebContents* GetWebContents() const OVERRIDE;
virtual void ShowDevTools() OVERRIDE; virtual void ShowDevTools() OVERRIDE;
virtual void CloseDevTools() OVERRIDE;
virtual bool IsDevToolsViewShowing() OVERRIDE; virtual bool IsDevToolsViewShowing() OVERRIDE;
virtual void SetDelegate(InspectableWebContentsDelegate* delegate) { virtual void SetDelegate(InspectableWebContentsDelegate* delegate) {

1
brightray/browser/inspectable_web_contents_view.h
View file

@ -12,6 +12,7 @@ class InspectableWebContentsView {
virtual gfx::NativeView GetNativeView() const = 0; virtual gfx::NativeView GetNativeView() const = 0;
virtual void ShowDevTools() = 0; virtual void ShowDevTools() = 0;
// Hide the DevTools view.
virtual void CloseDevTools() = 0; virtual void CloseDevTools() = 0;
virtual bool IsDevToolsViewShowing() = 0; virtual bool IsDevToolsViewShowing() = 0;
virtual bool SetDockSide(const std::string& side) = 0; virtual bool SetDockSide(const std::string& side) = 0;