From 7e0918f95a0eb4f7ee8b7f739e6c4dfe4919b083 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 12 May 2016 18:57:54 +0530
Subject: [PATCH 1/2] Revert "Merge pull request #218 from
 deepak1556/devtools_extensions_load_patch"

This reverts commit c0942cbbe67158c68ecfd9bf4cb7bdea84e0d529, reversing
changes made to a370461f3420ec285838126da7e7efd6a3101640.
---
 brightray/browser/inspectable_web_contents_impl.cc         | 3 ---
 brightray/browser/inspectable_web_contents_view_delegate.h | 1 -
 2 files changed, 4 deletions(-)

diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc
index 1648bee704..8353a71eb7 100644
--- a/brightray/browser/inspectable_web_contents_impl.cc
+++ b/brightray/browser/inspectable_web_contents_impl.cc
@@ -368,9 +368,6 @@ void InspectableWebContentsImpl::LoadCompleted() {
   // If the devtools can dock, "SetIsDocked" will be called by devtools itself.
   if (!can_dock_)
     SetIsDocked(DispatchCallback(), false);
-
-  if (view_->GetDelegate())
-    view_->GetDelegate()->DevToolsLoaded();
 }
 
 void InspectableWebContentsImpl::SetInspectedPageBounds(const gfx::Rect& rect) {
diff --git a/brightray/browser/inspectable_web_contents_view_delegate.h b/brightray/browser/inspectable_web_contents_view_delegate.h
index ce1b6e721b..900857c7a1 100644
--- a/brightray/browser/inspectable_web_contents_view_delegate.h
+++ b/brightray/browser/inspectable_web_contents_view_delegate.h
@@ -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();

From a01f8ba73918a14e3e09d5875763c243329083d2 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 12 May 2016 19:16:13 +0530
Subject: [PATCH 2/2] notify devtools opened and closed once per lifetime

---
 brightray/browser/inspectable_web_contents_impl.cc          | 6 ++++++
 brightray/browser/inspectable_web_contents_view_mac.mm      | 4 ----
 .../browser/views/inspectable_web_contents_view_views.cc    | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc
index 8353a71eb7..71c981bb40 100644
--- a/brightray/browser/inspectable_web_contents_impl.cc
+++ b/brightray/browser/inspectable_web_contents_impl.cc
@@ -368,6 +368,9 @@ void InspectableWebContentsImpl::LoadCompleted() {
   // If the devtools can dock, "SetIsDocked" will be called by devtools itself.
   if (!can_dock_)
     SetIsDocked(DispatchCallback(), false);
+
+  if (view_->GetDelegate())
+    view_->GetDelegate()->DevToolsOpened();
 }
 
 void InspectableWebContentsImpl::SetInspectedPageBounds(const gfx::Rect& rect) {
@@ -618,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(
diff --git a/brightray/browser/inspectable_web_contents_view_mac.mm b/brightray/browser/inspectable_web_contents_view_mac.mm
index f4c1cd5cb8..e708a68680 100644
--- a/brightray/browser/inspectable_web_contents_view_mac.mm
+++ b/brightray/browser/inspectable_web_contents_view_mac.mm
@@ -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() {
diff --git a/brightray/browser/views/inspectable_web_contents_view_views.cc b/brightray/browser/views/inspectable_web_contents_view_views.cc
index 79fcc10379..09c9ab6f80 100644
--- a/brightray/browser/views/inspectable_web_contents_view_views.cc
+++ b/brightray/browser/views/inspectable_web_contents_view_views.cc
@@ -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() {