Unify shared and service workers in chrome://inspect, remove service workers iframe.

chrome/browser/ui/webui/inspect_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/inspect_ui.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/devtools/devtools_targets_ui.h"
@@ skipping 257 matching lines @@
   SetPortForwardingDefaults();
   StartListeningNotifications();
   UpdateDiscoverUsbDevicesEnabled();
   UpdatePortForwardingEnabled();
   UpdatePortForwardingConfig();
 }
 
 void InspectUI::Inspect(const std::string& source_id,
                         const std::string& target_id) {
   DevToolsTargetImpl* target = FindTarget(source_id, target_id);
-  if (target)
+  if (target) {
+    std::string target_type = target->GetType();
     target->Inspect(Profile::FromWebUI(web_ui()));
+    ForceUpdateIfNeeded(source_id, target_type);

[horo, 2014/09/16 07:41:37]

ForceUpdateIfNeeded(source_id, target->GetType());

[dgozman, 2014/09/16 08:55:34]

What if executing action will lead to target being synchronously removed? We
have no protection here. This is not likely with Inspect, but Close or Reload
have no guarantees.

[horo, 2014/09/16 10:31:19]

Ah, I got it.

+  }
 }
 
 void InspectUI::Activate(const std::string& source_id,
                          const std::string& target_id) {
   DevToolsTargetImpl* target = FindTarget(source_id, target_id);
-  if (target)
+  if (target) {
+    std::string target_type = target->GetType();
     target->Activate();
+    ForceUpdateIfNeeded(source_id, target_type);

[horo, 2014/09/16 07:41:37]

ditto

+  }
 }
 
 void InspectUI::Close(const std::string& source_id,
                       const std::string& target_id) {
   DevToolsTargetImpl* target = FindTarget(source_id, target_id);
-  if (target)
+  if (target) {
+    std::string target_type = target->GetType();
     target->Close();
+    ForceUpdateIfNeeded(source_id, target_type);

[horo, 2014/09/16 07:41:38]

ditto

+  }
 }
 
 void InspectUI::Reload(const std::string& source_id,
                        const std::string& target_id) {
   DevToolsTargetImpl* target = FindTarget(source_id, target_id);
-  if (target)
+  if (target) {
+    std::string target_type = target->GetType();
     target->Reload();
+    ForceUpdateIfNeeded(source_id, target_type);

[horo, 2014/09/16 07:41:38]

ditto

+  }
 }
 
 static void NoOp(DevToolsTargetImpl*) {}
 
 void InspectUI::Open(const std::string& source_id,
                      const std::string& browser_id,
                      const std::string& url) {
   DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id);
   if (handler)
     handler->Open(browser_id, url, base::Bind(&NoOp));
@@ skipping 210 matching lines @@
          it->second->GetTarget(target_id) : NULL;
 }
 
 void InspectUI::PopulateTargets(const std::string& source,
                                 const base::ListValue& targets) {
   web_ui()->CallJavascriptFunction("populateTargets",
                                    base::StringValue(source),
                                    targets);
 }
 
+void InspectUI::ForceUpdateIfNeeded(const std::string& source_id,
+                                    const std::string& target_type) {
+  // TODO(dgozman): remove this after moving discovery to protocol.
+  // See crbug.com/398049.
+  if (target_type != DevToolsTargetImpl::kTargetTypeServiceWorker)
+    return;
+  DevToolsTargetsUIHandler* handler = FindTargetHandler(source_id);
+  if (handler)
+    handler->ForceUpdate();
+}
+
 void InspectUI::PopulatePortStatus(const base::Value& status) {
   web_ui()->CallJavascriptFunction("populatePortStatus", status);
 }
 
 void InspectUI::ShowIncognitoWarning() {
   web_ui()->CallJavascriptFunction("showIncognitoWarning");
 }