DevTools: Added service workers to chrome://inspect/#devices

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 78 matching lines @@
   explicit RenderViewHostTargetsUIHandler(const Callback& callback);
   virtual ~RenderViewHostTargetsUIHandler();
 
  private:
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   void UpdateTargets();
+  void OnTargetsReceived(const DevToolsTargetImpl::List& targets);
 
   content::NotificationRegistrar notification_registrar_;
   scoped_ptr<CancelableTimer> timer_;
+  base::WeakPtrFactory<RenderViewHostTargetsUIHandler> weak_factory_;
 };
 
 RenderViewHostTargetsUIHandler::RenderViewHostTargetsUIHandler(
     const Callback& callback)
-    : DevToolsTargetsUIHandler(kTargetSourceRenderer, callback) {
+    : DevToolsTargetsUIHandler(kTargetSourceRenderer, callback),
+      weak_factory_(this) {
   notification_registrar_.Add(this,
                               content::NOTIFICATION_WEB_CONTENTS_CONNECTED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                               content::NotificationService::AllSources());
   UpdateTargets();
 }
 
 RenderViewHostTargetsUIHandler::~RenderViewHostTargetsUIHandler() {
   notification_registrar_.RemoveAll();
 }
 
 void RenderViewHostTargetsUIHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   const int kUpdateDelay = 100;
   timer_.reset(
       new CancelableTimer(
           base::Bind(&RenderViewHostTargetsUIHandler::UpdateTargets,
                      base::Unretained(this)),
           base::TimeDelta::FromMilliseconds(kUpdateDelay)));
 }
 
 void RenderViewHostTargetsUIHandler::UpdateTargets() {
+  DevToolsTargetImpl::EnumerateRenderViewHostTargets(
+      base::Bind(&RenderViewHostTargetsUIHandler::OnTargetsReceived,
+                 weak_factory_.GetWeakPtr()));
+}
+
+void RenderViewHostTargetsUIHandler::OnTargetsReceived(
+    const DevToolsTargetImpl::List& targets) {
   base::ListValue list_value;
 
   std::map<std::string, base::DictionaryValue*> id_to_descriptor;
 
-  DevToolsTargetImpl::List targets =
-      DevToolsTargetImpl::EnumerateRenderViewHostTargets();
-
   STLDeleteValues(&targets_);
-  for (DevToolsTargetImpl::List::iterator it = targets.begin();
+  for (DevToolsTargetImpl::List::const_iterator it = targets.begin();
       it != targets.end(); ++it) {
     DevToolsTargetImpl* target = *it;
     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;
     base::DictionaryValue* descriptor = id_to_descriptor[target->GetId()];
 
@@ skipping 407 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);
 }