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

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 2013 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/devtools/devtools_targets_ui.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 138 matching lines @@
 
 // LocalTargetsUIHandler ---------------------------------------------
 
 class LocalTargetsUIHandler
     : public DevToolsTargetsUIHandler,
       public content::NotificationObserver {
  public:
   explicit LocalTargetsUIHandler(const Callback& callback);
   virtual ~LocalTargetsUIHandler();
 
+  // DevToolsTargetsUIHandler overrides.
+  virtual void ForceUpdate() OVERRIDE;
+
 private:
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   void ScheduleUpdate();
   void UpdateTargets();
   void SendTargets(const DevToolsTargetImpl::List& targets);
 
@@ skipping 27 matching lines @@
   observer_->Stop();
 }
 
 void LocalTargetsUIHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   ScheduleUpdate();
 }
 
+void LocalTargetsUIHandler::ForceUpdate() {
+  ScheduleUpdate();
+}
+
 void LocalTargetsUIHandler::ScheduleUpdate() {
   const int kUpdateDelay = 100;
   timer_.reset(
       new CancelableTimer(
           base::Bind(&LocalTargetsUIHandler::UpdateTargets,
                      base::Unretained(this)),
           base::TimeDelta::FromMilliseconds(kUpdateDelay)));
 }
 
 void LocalTargetsUIHandler::UpdateTargets() {
   DevToolsTargetImpl::EnumerateAllTargets(base::Bind(
       &LocalTargetsUIHandler::SendTargets,
       weak_factory_.GetWeakPtr()));
 }
 
 void LocalTargetsUIHandler::SendTargets(
     const DevToolsTargetImpl::List& targets) {
   base::ListValue list_value;
   std::map<std::string, base::DictionaryValue*> id_to_descriptor;
 
   STLDeleteValues(&targets_);
   for (DevToolsTargetImpl::List::const_iterator it = targets.begin();
       it != targets.end(); ++it) {
     DevToolsTargetImpl* target = *it;
-    if (target->GetType() == DevToolsTargetImpl::kTargetTypeServiceWorker)
-      continue;
     targets_[target->GetId()] = target;
     id_to_descriptor[target->GetId()] = Serialize(*target);
   }
 
   for (TargetMap::iterator it(targets_.begin()); it != targets_.end(); ++it) {
     DevToolsTargetImpl* target = it->second;
-    if (target->GetType() == DevToolsTargetImpl::kTargetTypeServiceWorker)
-      continue;
     base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()];
-
     std::string parent_id = target->GetParentId();
     if (parent_id.empty() || id_to_descriptor.count(parent_id) == 0) {
       list_value.Append(descriptor);
     } else {
       base::DictionaryValue* parent = id_to_descriptor[parent_id];
       base::ListValue* guests = NULL;
       if (!parent->GetList(kGuestList, &guests)) {
         guests = new base::ListValue();
         parent->Set(kGuestList, guests);
       }
@@ skipping 216 matching lines @@
   target_data->SetString(kFaviconUrlField, target.GetFaviconURL().spec());
   target_data->SetString(kDescriptionField, target.GetDescription());
   return target_data;
 }
 
 void DevToolsTargetsUIHandler::SendSerializedTargets(
     const base::ListValue& list) {
   callback_.Run(source_id_, list);
 }
 
+void DevToolsTargetsUIHandler::ForceUpdate() {
+}
+
 // PortForwardingStatusSerializer ---------------------------------------------
 
 PortForwardingStatusSerializer::PortForwardingStatusSerializer(
     const Callback& callback, Profile* profile)
       : callback_(callback),
         profile_(profile) {
   DevToolsAndroidBridge* android_bridge =
       DevToolsAndroidBridge::Factory::GetForProfile(profile_);
   if (android_bridge)
     android_bridge->AddPortForwardingListener(this);
@@ skipping 19 matching lines @@
           base::StringPrintf("%d", it->first), it->second);
     }
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first.c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }