summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhoro <horo@chromium.org>2015-06-09 20:14:13 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-10 03:15:39 +0000
commit938e803e0a762fde0935ad7005e8f84d84f7e36e (patch)
tree75c4f1e3de980a4cc466805df3610dd28942513a
parent96a824763c2cbb50b4b0bbad2b7531c3fdd5ce6e (diff)
downloadchromium_src-938e803e0a762fde0935ad7005e8f84d84f7e36e.zip
chromium_src-938e803e0a762fde0935ad7005e8f84d84f7e36e.tar.gz
chromium_src-938e803e0a762fde0935ad7005e8f84d84f7e36e.tar.bz2
[1/5 chromium] Shows the clients which are controlled by ServiceWorker in DevTools.
This cl implements ServiceWorkerHandler::ActivateTarget() to focus the tab which is controlled by ServiceWorker. Screenshot: https://code.google.com/p/chromium/issues/detail?id=466871#c65 1/5 chromium: This cl. 2/5 blink: https://codereview.chromium.org/1151993003/ 3/5 chromium: https://codereview.chromium.org/1149383004/ 4/5 blink: https://codereview.chromium.org/1164583002/ 5/5 chromium: https://codereview.chromium.org/1143363009/ BUG=466871 Review URL: https://codereview.chromium.org/1160133002 Cr-Commit-Position: refs/heads/master@{#333671}
-rw-r--r--content/browser/devtools/protocol/service_worker_handler.cc14
-rw-r--r--content/browser/devtools/protocol/service_worker_handler.h3
2 files changed, 17 insertions, 0 deletions
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
index 907d8a5..de97cc8 100644
--- a/content/browser/devtools/protocol/service_worker_handler.cc
+++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -397,6 +397,20 @@ Response ServiceWorkerHandler::DeliverPushMessage(
return Response::OK();
}
+Response ServiceWorkerHandler::GetTargetInfo(DevToolsCommandId command_id,
+ const std::string& target_id) {
+ return Response::InternalError("Not implemented yet");
+}
+
+Response ServiceWorkerHandler::ActivateTarget(const std::string& target_id) {
+ scoped_refptr<DevToolsAgentHost> agent_host(
+ DevToolsAgentHost::GetForId(target_id));
+ if (!agent_host)
+ return Response::InvalidParams("targetId");
+ agent_host->Activate();
+ return Response::OK();
+}
+
void ServiceWorkerHandler::OpenNewDevToolsWindow(int process_id,
int devtools_agent_route_id) {
scoped_refptr<DevToolsAgentHostImpl> agent_host(
diff --git a/content/browser/devtools/protocol/service_worker_handler.h b/content/browser/devtools/protocol/service_worker_handler.h
index 629fff0..5c7c1ca 100644
--- a/content/browser/devtools/protocol/service_worker_handler.h
+++ b/content/browser/devtools/protocol/service_worker_handler.h
@@ -59,6 +59,9 @@ class ServiceWorkerHandler : public DevToolsAgentHostClient,
Response DeliverPushMessage(const std::string& origin,
const std::string& registration_id,
const std::string& data);
+ Response GetTargetInfo(DevToolsCommandId command_id,
+ const std::string& target_id);
+ Response ActivateTarget(const std::string& target_id);
// WorkerDevToolsManager::Observer implementation.
void WorkerCreated(ServiceWorkerDevToolsAgentHost* host) override;