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 5f602758a65a91fbabc639d7f4757eabcec0fed6..3b6ab212a6b724ef81c830ba6edcb68965fa8dfb 100644 |
--- a/chrome/browser/devtools/devtools_targets_ui.cc |
+++ b/chrome/browser/devtools/devtools_targets_ui.cc |
@@ -77,7 +77,7 @@ class CancelableTimer { |
FROM_HERE, |
base::Bind(&CancelableTimer::Fire, weak_factory_.GetWeakPtr()), |
delay); |
- }; |
+ } |
private: |
void Fire() { callback_.Run(); } |
@@ -344,6 +344,9 @@ class AdbTargetsUIHandler |
const std::string& url, |
const DevToolsTargetsUIHandler::TargetCallback&) OVERRIDE; |
+ virtual scoped_refptr<content::DevToolsAgentHost> GetBrowserAgentHost( |
+ const std::string& browser_id) OVERRIDE; |
+ |
private: |
// DevToolsAndroidBridge::Listener overrides. |
virtual void DeviceListChanged( |
@@ -388,6 +391,13 @@ void AdbTargetsUIHandler::Open( |
it->second->Open(url, base::Bind(&CallOnTarget, callback)); |
} |
+scoped_refptr<content::DevToolsAgentHost> |
+AdbTargetsUIHandler::GetBrowserAgentHost( |
+ const std::string& browser_id) { |
+ RemoteBrowsers::iterator it = remote_browsers_.find(browser_id); |
+ return it != remote_browsers_.end() ? it->second->GetAgentHost() : NULL; |
+} |
+ |
void AdbTargetsUIHandler::DeviceListChanged( |
const DevToolsAndroidBridge::RemoteDevices& devices) { |
remote_browsers_.clear(); |
@@ -531,6 +541,11 @@ void DevToolsTargetsUIHandler::Open(const std::string& browser_id, |
callback.Run(NULL); |
} |
+scoped_refptr<content::DevToolsAgentHost> |
+DevToolsTargetsUIHandler::GetBrowserAgentHost(const std::string& browser_id) { |
+ return NULL; |
+} |
+ |
base::DictionaryValue* DevToolsTargetsUIHandler::Serialize( |
const DevToolsTargetImpl& target) { |
base::DictionaryValue* target_data = new base::DictionaryValue(); |