Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1669)

Unified Diff: android_webview/browser/aw_dev_tools_discovery_provider.cc

Issue 2273063002: DevTools: remove DevToolsTargetDescriptor and its implementations, we are now based on devtools age… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/aw_dev_tools_discovery_provider.cc
diff --git a/android_webview/browser/aw_dev_tools_discovery_provider.cc b/android_webview/browser/aw_dev_tools_discovery_provider.cc
index 82b746c7633bfb3c3f117891feb5c89d9de766a3..6e2fb5bb87f7e29307ebff4e906d2162eeb80cfb 100644
--- a/android_webview/browser/aw_dev_tools_discovery_provider.cc
+++ b/android_webview/browser/aw_dev_tools_discovery_provider.cc
@@ -10,7 +10,6 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "components/devtools_discovery/basic_target_descriptor.h"
#include "components/devtools_discovery/devtools_discovery_manager.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/web_contents.h"
@@ -58,17 +57,14 @@ AwDevToolsDiscoveryProvider::AwDevToolsDiscoveryProvider() {
AwDevToolsDiscoveryProvider::~AwDevToolsDiscoveryProvider() {
}
-devtools_discovery::DevToolsTargetDescriptor::List
+content::DevToolsAgentHost::List
AwDevToolsDiscoveryProvider::GetDescriptors() {
DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll();
- devtools_discovery::DevToolsTargetDescriptor::List result;
- result.reserve(agent_hosts.size());
for (auto& agent_host : agent_hosts) {
agent_host->SetDescriptionOverride(
GetViewDescription(agent_host->GetWebContents()));
- result.push_back(new devtools_discovery::BasicTargetDescriptor(agent_host));
}
- return result;
+ return agent_hosts;
}
} // namespace android_webview

Powered by Google App Engine
This is Rietveld 408576698