Add UI DevTools under chrome://inspect/#other

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 <memory>
 #include <utility>
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
+#include "components/ui_devtools/devtools_server.h"
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/worker_service.h"
@@ skipping 31 matching lines @@
 const char kAdbBrowserVersionField[] = "adbBrowserVersion";
 const char kAdbBrowserChromeVersionField[] = "adbBrowserChromeVersion";
 const char kAdbPagesList[] = "pages";
 
 const char kAdbScreenWidthField[] = "adbScreenWidth";
 const char kAdbScreenHeightField[] = "adbScreenHeight";
 
 const char kPortForwardingPorts[] = "ports";
 const char kPortForwardingBrowserId[] = "browserId";
 
+const char kUiDevTools[] = "isUiDevTools";
+const char kUiDevToolsTargetType[] = "ui_devtools";
+
+void PopulateTargetsWithUiDevtools(base::ListValue& targets) {
+  for (const auto& client_pair :
+       ui::devtools::UiDevToolsServer::GetClientNamesAndUrls()) {
+    auto target_data = base::MakeUnique<base::DictionaryValue>();
+    target_data->SetString(kNameField, client_pair.first);
+    target_data->SetString(kUrlField, client_pair.second);
+    target_data->SetString(kTargetTypeField, kUiDevToolsTargetType);
+    target_data->SetBoolean(kUiDevTools, true);
+    targets.Append(std::move(target_data));
+  }
+}
+
 // CancelableTimer ------------------------------------------------------------
 
 class CancelableTimer {
  public:
   CancelableTimer(base::Closure callback, base::TimeDelta delay)
       : callback_(callback),
         weak_factory_(this) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&CancelableTimer::Fire, weak_factory_.GetWeakPtr()), delay);
@@ skipping 171 matching lines @@
       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);
       }
       guests->Append(base::WrapUnique(descriptor));
     }
   }
 
+  PopulateTargetsWithUiDevtools(list_value);

[dgozman, 2016/11/15 23:47:08]

Instead of adding to local targets, let's handle it separately in inspect_ui.cc.
We can have a separate command 'populate-additional-targets' from cc to js
similarly to inspect-additional going back.

[Sarmad Hashmi, 2016/11/16 01:42:57]

Done.

   SendSerializedTargets(list_value);
 }
 
 // AdbTargetsUIHandler --------------------------------------------------------
 
 class AdbTargetsUIHandler
     : public DevToolsTargetsUIHandler,
       public DevToolsAndroidBridge::DeviceListListener {
  public:
   AdbTargetsUIHandler(const Callback& callback, Profile* profile);
@@ skipping 221 matching lines @@
     device_status_dict->SetString(kPortForwardingBrowserId,
                                   sit->first->GetId());
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first->serial().c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }