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

Merge pull request #219 from deepak1556/devtools_lifecycle_events_patch

Browse Source 
notify devtools open and close once per lifetime
This commit is contained in:
Cheng Zhao
2016-05-13 09:14:44 +09:00
parent c860689a9b a01f8ba739
commit 768efe89cf
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
brightray/browser/inspectable_web_contents_impl.cc
View File

@@ -370,7 +370,7 @@ void InspectableWebContentsImpl::LoadCompleted() {
SetIsDocked(DispatchCallback(), false);
if (view_->GetDelegate())
view_->GetDelegate()->DevToolsLoaded();
view_->GetDelegate()->DevToolsOpened();
}
void InspectableWebContentsImpl::SetInspectedPageBounds(const gfx::Rect& rect) {
@@ -621,6 +621,9 @@ void InspectableWebContentsImpl::WebContentsDestroyed() {
for (const auto& pair : pending_requests_)
delete pair.first;
if (view_ && view_->GetDelegate())
view_->GetDelegate()->DevToolsClosed();
}
bool InspectableWebContentsImpl::AddMessageToConsole(

1
brightray/browser/inspectable_web_contents_view_delegate.h
View File

@@ -12,7 +12,6 @@ class InspectableWebContentsViewDelegate {
virtual void DevToolsFocused() {}
virtual void DevToolsOpened() {}
virtual void DevToolsClosed() {}
virtual void DevToolsLoaded() {}
// Returns the icon of devtools window.
virtual gfx::ImageSkia GetDevToolsWindowIcon();

4
brightray/browser/inspectable_web_contents_view_mac.mm
View File

@@ -29,14 +29,10 @@ gfx::NativeView InspectableWebContentsViewMac::GetNativeView() const {
void InspectableWebContentsViewMac::ShowDevTools() {
[view_ setDevToolsVisible:YES];
if (GetDelegate())
GetDelegate()->DevToolsOpened();
}
void InspectableWebContentsViewMac::CloseDevTools() {
[view_ setDevToolsVisible:NO];
if (GetDelegate())
GetDelegate()->DevToolsClosed();
}
bool InspectableWebContentsViewMac::IsDevToolsViewShowing() {

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

@@ -118,8 +118,6 @@ void InspectableWebContentsViewViews::ShowDevTools() {
devtools_web_view_->RequestFocus();
Layout();
}
if (GetDelegate())
GetDelegate()->DevToolsOpened();
}
void InspectableWebContentsViewViews::CloseDevTools() {
@@ -137,8 +135,6 @@ void InspectableWebContentsViewViews::CloseDevTools() {
devtools_web_view_->SetWebContents(NULL);
Layout();
}
if (GetDelegate())
GetDelegate()->DevToolsClosed();
}
bool InspectableWebContentsViewViews::IsDevToolsViewShowing() {