DevTools: Make Frontend treat remote service workers as workers

chrome/browser/devtools/device/devtools_android_bridge.cc

 // Copyright 2014 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/device/devtools_android_bridge.h"
 
 #include <map>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 390 matching lines @@
   virtual void Inspect(Profile* profile) const OVERRIDE;
   virtual void Reload() const OVERRIDE;
 
   void Navigate(const std::string& url, base::Closure callback) const;
 
  private:
   scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser_;
   std::string debug_url_;
   std::string frontend_url_;
   std::string remote_id_;
+  std::string remote_type_;
   DISALLOW_COPY_AND_ASSIGN(RemotePageTarget);
 };
 
 static std::string GetStringProperty(const base::DictionaryValue& value,
                                      const std::string& name) {
   std::string result;
   value.GetString(name, &result);
   return result;
 }
 
@@ skipping 15 matching lines @@
 }
 
 RemotePageTarget::RemotePageTarget(
     scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser,
     const base::DictionaryValue& value)
     : DevToolsTargetImpl(AgentHostDelegate::GetOrCreateAgentHost(
                              BuildUniqueTargetId(browser.get(), value),
                              browser, GetDebugURL(value))),
       browser_(browser),
       debug_url_(GetDebugURL(value)),
-      remote_id_(GetStringProperty(value, "id")) {
+      remote_id_(GetStringProperty(value, "id")),
+      remote_type_(GetStringProperty(value, "type")) {
   set_type("adb_page");
   set_url(GURL(GetStringProperty(value, "url")));
   set_title(base::UTF16ToUTF8(net::UnescapeForHTML(base::UTF8ToUTF16(
       GetStringProperty(value, "title")))));
   set_description(GetStringProperty(value, "description"));
   set_favicon_url(GURL(GetStringProperty(value, "faviconUrl")));
   debug_url_ = GetDebugURL(value);
   frontend_url_ = GetStringProperty(value, "devtoolsFrontendUrl");
 
   size_t ws_param = frontend_url_.find("?ws");
@@ skipping 19 matching lines @@
 }
 
 bool RemotePageTarget::IsAttached() const {
   return debug_url_.empty();
 }
 
 static void NoOp(int, const std::string&) {}
 
 void RemotePageTarget::Inspect(Profile* profile) const {
   Activate();
-  DevToolsWindow::OpenExternalFrontend(profile, frontend_url_,
-                                       GetAgentHost());
+  bool isWorker = remote_type_ == "worker" || remote_type_ == "service_worker";

[dgozman, 2014/08/22 16:33:03]

Please use constants from devtools_target_impl.

[vkuzkokov, 2014/08/25 15:11:38]

Done.

+  DevToolsWindow::OpenExternalFrontend(profile, frontend_url_, GetAgentHost(),
+                                       isWorker);
 }
 
 bool RemotePageTarget::Activate() const {
   std::string request = base::StringPrintf(kActivatePageRequest,
                                            remote_id_.c_str());
   browser_->SendJsonRequest(request, base::Bind(&NoOp));
   return true;
 }
 
 bool RemotePageTarget::Close() const {
@@ skipping 387 matching lines @@
   bool enabled;
   if (pref_value->GetAsBoolean(&enabled) && enabled) {
     device_providers.push_back(new UsbDeviceProvider(profile_));
   }
   device_manager_->SetDeviceProviders(device_providers);
   if (!device_list_listeners_.empty()) {
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }