Chromium Code Reviews| Index: chrome/browser/devtools/devtools_targets_ui.cc |
| diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc |
| index 300848ea7f576675700aabba08003c5687bf674b..15510a1348e869487d8a8feec7960574ec61f51d 100644 |
| --- a/chrome/browser/devtools/devtools_targets_ui.cc |
| +++ b/chrome/browser/devtools/devtools_targets_ui.cc |
| @@ -18,6 +18,7 @@ |
| #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" |
| @@ -69,6 +70,21 @@ 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 { |
| @@ -260,6 +276,7 @@ void LocalTargetsUIHandler::SendTargets( |
| } |
| } |
| + PopulateTargetsWithUiDevtools(list_value); |
|
dgozman
2016/11/15 23:47:08
Instead of adding to local targets, let's handle i
Sarmad Hashmi
2016/11/16 01:42:57
Done.
|
| SendSerializedTargets(list_value); |
| } |