DevTools: Added service workers to remote debugging targets

chrome/browser/android/dev_tools_server.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/android/dev_tools_server.h"
 
 #include <pwd.h>
 #include <cstring>
 
 #include "base/android/jni_string.h"
@@ skipping 48 matching lines @@
 // Chrome for Android from a newer version of desktop Chrome is a very common
 // scenario, the client code will have to be modified to recognize both the old
 // and the new format.
 const char kDevToolsChannelNameFormat[] = "%s_devtools_remote";
 
 const char kFrontEndURL[] =
     "http://chrome-devtools-frontend.appspot.com/serve_rev/%s/devtools.html";
 const char kTetheringSocketName[] = "chrome_devtools_tethering_%d_%d";
 
 const char kTargetTypePage[] = "page";
-const char kTargetTypeOther[] = "other";
 
 static GURL GetFaviconURLForContents(WebContents* web_contents) {
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   if (entry != NULL && entry->GetURL().is_valid())
     return entry->GetFavicon().url;
   return GURL();
 }
 
+static GURL GetFaviconURLForAgentHost(
+    scoped_refptr<DevToolsAgentHost> agent_host) {
+  if (WebContents* web_contents = agent_host->GetWebContents())
+    return GetFaviconURLForContents(web_contents);
+  return GURL();
+}
+
+static base::TimeTicks GetLastActiveTimeForAgentHost(
+    scoped_refptr<DevToolsAgentHost> agent_host) {
+  if (WebContents* web_contents = agent_host->GetWebContents())
+    return web_contents->GetLastActiveTime();
+  return base::TimeTicks();
+}
+
 bool AuthorizeSocketAccessWithDebugPermission(
     const net::UnixDomainServerSocket::Credentials& credentials) {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_DevToolsServer_checkDebugPermission(
       env, base::android::GetApplicationContext(),
       credentials.process_id, credentials.user_id) ||
       content::CanUserConnectToDevTools(credentials);
 }
 
 class TargetBase : public content::DevToolsTarget {
@@ skipping 14 matching lines @@
   }
 
  protected:
   explicit TargetBase(WebContents* web_contents)
       : title_(base::UTF16ToUTF8(web_contents->GetTitle())),
         url_(web_contents->GetURL()),
         favicon_url_(GetFaviconURLForContents(web_contents)),
         last_activity_time_(web_contents->GetLastActiveTime()) {
   }
 
-  TargetBase(const base::string16& title, const GURL& url)
-      : title_(base::UTF16ToUTF8(title)),
-        url_(url)
-  {}
+  explicit TargetBase(scoped_refptr<DevToolsAgentHost> agent_host)
+      : title_(agent_host->GetTitle()),
+        url_(agent_host->GetURL()),
+        favicon_url_(GetFaviconURLForAgentHost(agent_host)),
+        last_activity_time_(GetLastActiveTimeForAgentHost(agent_host)) {
+  }
+
+  TargetBase(const std::string& title, const GURL& url)
+      : title_(title),
+        url_(url) {
+  }
 
  private:
   const std::string title_;
   const GURL url_;
   const GURL favicon_url_;
   const base::TimeTicks last_activity_time_;
 };
 
 class TabTarget : public TargetBase {
  public:
   static TabTarget* CreateForWebContents(int tab_id,
                                          WebContents* web_contents) {
     return new TabTarget(tab_id, web_contents);
   }
 
   static TabTarget* CreateForUnloadedTab(int tab_id,
                                          const base::string16& title,
                                          const GURL& url) {
     return new TabTarget(tab_id, title, url);
   }
 
   // content::DevToolsTarget implementation:
   virtual std::string GetId() const OVERRIDE {
     return base::IntToString(tab_id_);
   }
 
-  virtual std::string GetType() const OVERRIDE { return kTargetTypePage; }
+  virtual std::string GetType() const OVERRIDE {
+    return kTargetTypePage;
+  }
 
   virtual bool IsAttached() const OVERRIDE {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
       return false;
     WebContents* web_contents = model->GetWebContentsAt(index);
     if (!web_contents)
       return false;
     return DevToolsAgentHost::IsDebuggerAttached(web_contents);
@@ skipping 34 matching lines @@
     return true;
   }
 
  private:
   TabTarget(int tab_id, WebContents* web_contents)
       : TargetBase(web_contents),
         tab_id_(tab_id) {
   }
 
   TabTarget(int tab_id, const base::string16& title, const GURL& url)
-      : TargetBase(title, url),
+      : TargetBase(base::UTF16ToUTF8(title), url),
         tab_id_(tab_id) {
   }
 
   bool FindTab(TabModel** model_result, int* index_result) const {
     for (TabModelList::const_iterator iter = TabModelList::begin();
         iter != TabModelList::end(); ++iter) {
       TabModel* model = *iter;
       for (int i = 0; i < model->GetTabCount(); ++i) {
         TabAndroid* tab = model->GetTabAt(i);
         if (tab->GetAndroidId() == tab_id_) {
           *model_result = model;
           *index_result = i;
           return true;
         }
       }
     }
     return false;
   }
 
   const int tab_id_;
 };
 
 class NonTabTarget : public TargetBase {
  public:
-  explicit NonTabTarget(WebContents* web_contents)
-      : TargetBase(web_contents),
-        agent_host_(DevToolsAgentHost::GetOrCreateFor(web_contents)) {
+  explicit NonTabTarget(scoped_refptr<DevToolsAgentHost> agent_host)
+      : TargetBase(agent_host),
+        agent_host_(agent_host) {
   }
 
   // content::DevToolsTarget implementation:
   virtual std::string GetId() const OVERRIDE {
     return agent_host_->GetId();
   }
 
   virtual std::string GetType() const OVERRIDE {
-    if (TabModelList::begin() == TabModelList::end()) {
-      // If there are no tab models we must be running in ChromeShell.
-      // Return the 'page' target type for backwards compatibility.
-      return kTargetTypePage;
-    }
-    return kTargetTypeOther;
+    std::string result = agent_host_->GetType();
+    if (result == DevToolsAgentHost::kTypeWebContents)
+      result = kTargetTypePage;
+    return result;
   }
 
   virtual bool IsAttached() const OVERRIDE {
     return agent_host_->IsAttached();
   }
 
   virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
     return agent_host_;
   }
 
   virtual bool Activate() const OVERRIDE {
-    WebContents* web_contents = agent_host_->GetWebContents();
-    if (!web_contents)
-      return false;
-    web_contents->GetDelegate()->ActivateContents(web_contents);
-    return true;
+    return agent_host_->Activate();
   }
 
   virtual bool Close() const OVERRIDE {
-    WebContents* web_contents = agent_host_->GetWebContents();
-    if (!web_contents)
-      return false;
-    web_contents->GetRenderViewHost()->ClosePage();
-    return true;
+    return agent_host_->Close();
   }
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
 };
 
 // Delegate implementation for the devtools http handler on android. A new
 // instance of this gets created each time devtools is enabled.
 class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
  public:
@@ skipping 70 matching lines @@
                                                             web_contents));
         } else {
           targets.push_back(TabTarget::CreateForUnloadedTab(tab->GetAndroidId(),
                                                             tab->GetTitle(),
                                                             tab->GetURL()));
         }
       }
     }
 
     // Add targets for WebContents not associated with any tabs.
-    std::vector<WebContents*> wc_list =
-        DevToolsAgentHost::GetInspectableWebContents();
-    for (std::vector<WebContents*>::iterator it = wc_list.begin();
-         it != wc_list.end();
-         ++it) {
-      if (tab_web_contents.find(*it) != tab_web_contents.end())
-        continue;
+    DevToolsAgentHost::List agents =
+        DevToolsAgentHost::GetOrCreateAll();
+    for (DevToolsAgentHost::List::iterator it = agents.begin();
+         it != agents.end(); ++it) {
+      if (WebContents* web_contents = (*it)->GetWebContents()) {
+        if (tab_web_contents.find(web_contents) != tab_web_contents.end())
+          continue;
+      }
       targets.push_back(new NonTabTarget(*it));
     }
 
     callback.Run(targets);
   }
 
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) OVERRIDE {
     *name = base::StringPrintf(
@@ skipping 99 matching lines @@
                                       jlong server,
                                       jboolean enabled,
                                       jboolean allow_debug_permission) {
   DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start(allow_debug_permission);
   } else {
     devtools_server->Stop();
   }
 }