summaryrefslogtreecommitdiffstats
path: root/components/devtools_discovery
diff options
context:
space:
mode:
authordgozman <dgozman@chromium.org>2015-04-28 03:36:39 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-28 10:36:31 +0000
commitec2b982acd3d3b1ef7b52d9458157514144e9b25 (patch)
treecb0c145e63d886c456fbf833b8fd6156adb0442e /components/devtools_discovery
parent2d56df1b08b8c8439315efc3f6af2dc053db16a0 (diff)
downloadchromium_src-ec2b982acd3d3b1ef7b52d9458157514144e9b25.zip
chromium_src-ec2b982acd3d3b1ef7b52d9458157514144e9b25.tar.gz
chromium_src-ec2b982acd3d3b1ef7b52d9458157514144e9b25.tar.bz2
[DevTools] Migrate android to devtools_discovery.
BUG=476496 Review URL: https://codereview.chromium.org/1099243004 Cr-Commit-Position: refs/heads/master@{#327258}
Diffstat (limited to 'components/devtools_discovery')
-rw-r--r--components/devtools_discovery/devtools_discovery_manager.cc12
-rw-r--r--components/devtools_discovery/devtools_discovery_manager.h6
2 files changed, 18 insertions, 0 deletions
diff --git a/components/devtools_discovery/devtools_discovery_manager.cc b/components/devtools_discovery/devtools_discovery_manager.cc
index 3138732..ff006bd 100644
--- a/components/devtools_discovery/devtools_discovery_manager.cc
+++ b/components/devtools_discovery/devtools_discovery_manager.cc
@@ -40,6 +40,18 @@ DevToolsTargetDescriptor::List DevToolsDiscoveryManager::GetDescriptors() {
return result;
}
+void DevToolsDiscoveryManager::SetCreateCallback(
+ const CreateCallback& callback) {
+ create_callback_ = callback;
+}
+
+scoped_ptr<DevToolsTargetDescriptor>
+DevToolsDiscoveryManager::CreateNew(const GURL& url) {
+ if (create_callback_.is_null())
+ return scoped_ptr<DevToolsTargetDescriptor>();
+ return create_callback_.Run(url);
+}
+
DevToolsTargetDescriptor::List
DevToolsDiscoveryManager::GetDescriptorsFromProviders() {
DevToolsTargetDescriptor::List result;
diff --git a/components/devtools_discovery/devtools_discovery_manager.h b/components/devtools_discovery/devtools_discovery_manager.h
index c75f844..fa2b630 100644
--- a/components/devtools_discovery/devtools_discovery_manager.h
+++ b/components/devtools_discovery/devtools_discovery_manager.h
@@ -21,13 +21,18 @@ class DevToolsDiscoveryManager {
virtual DevToolsTargetDescriptor::List GetDescriptors() = 0;
};
+ using CreateCallback = base::Callback<
+ scoped_ptr<DevToolsTargetDescriptor>(const GURL& url)>;
+
// Returns single instance of this class. The instance is destroyed on the
// browser main loop exit so this method MUST NOT be called after that point.
static DevToolsDiscoveryManager* GetInstance();
void AddProvider(scoped_ptr<Provider> provider);
+ void SetCreateCallback(const CreateCallback& callback);
DevToolsTargetDescriptor::List GetDescriptors();
+ scoped_ptr<DevToolsTargetDescriptor> CreateNew(const GURL& url);
private:
friend struct DefaultSingletonTraits<DevToolsDiscoveryManager>;
@@ -37,6 +42,7 @@ class DevToolsDiscoveryManager {
DevToolsTargetDescriptor::List GetDescriptorsFromProviders();
std::vector<Provider*> providers_;
+ CreateCallback create_callback_;
DISALLOW_COPY_AND_ASSIGN(DevToolsDiscoveryManager);
};