diff options
author | dgozman <dgozman@chromium.org> | 2014-09-18 07:28:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 14:28:21 +0000 |
commit | ffe70eca0f81753c11052b9229128f72d49c45ea (patch) | |
tree | e009fa0dba05ab2236c502270606411ceba13082 /content/browser/resources | |
parent | 41ade6e937ef92bd1e4e64622a4c5b31861cf822 (diff) | |
download | chromium_src-ffe70eca0f81753c11052b9229128f72d49c45ea.zip chromium_src-ffe70eca0f81753c11052b9229128f72d49c45ea.tar.gz chromium_src-ffe70eca0f81753c11052b9229128f72d49c45ea.tar.bz2 |
Unify shared and service workers in chrome://inspect, remove service workers iframe.
BUG=none
Review URL: https://codereview.chromium.org/568403002
Cr-Commit-Position: refs/heads/master@{#295466}
Diffstat (limited to 'content/browser/resources')
-rw-r--r-- | content/browser/resources/service_worker/serviceworker_internals.js | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/content/browser/resources/service_worker/serviceworker_internals.js b/content/browser/resources/service_worker/serviceworker_internals.js index 3eda10f..23e8983 100644 --- a/content/browser/resources/service_worker/serviceworker_internals.js +++ b/content/browser/resources/service_worker/serviceworker_internals.js @@ -6,20 +6,9 @@ cr.define('serviceworker', function() { 'use strict'; function initialize() { - if (window.location.hash == "#iframe") { - // This page is loaded from chrome://inspect. - window.addEventListener('message', onMessage.bind(this), false); - } update(); } - function onMessage(event) { - if (event.origin != 'chrome://inspect') { - return; - } - sendCommand(event.data.action, event.data.worker); - } - function update() { chrome.send('GetOptions'); chrome.send('getAllRegistrations'); @@ -85,31 +74,6 @@ cr.define('serviceworker', function() { update(); } - // Send the active ServiceWorker information to chrome://inspect. - function sendToInspectPage(live_registrations, - partition_id) { - var workers = []; - live_registrations.forEach(function(registration) { - [registration.active, registration.waiting].forEach(function(version) { - if (!version || version.running_status != 'RUNNING') { - return; - } - workers.push({ - 'scope': registration.scope, - 'url': version.script_url, - 'partition_id': partition_id, - 'version_id': version.version_id, - 'process_id': version.process_id, - 'devtools_agent_route_id': - version.devtools_agent_route_id - }); - }); - }); - window.parent.postMessage( - {'partition_id': partition_id, 'workers': workers}, - 'chrome://inspect'); - } - var allLogMessages = {}; // Set log for a worker version. function fillLogForVersion(partition_id, version) { @@ -171,11 +135,6 @@ cr.define('serviceworker', function() { stored_registrations, partition_id, partition_path) { - if (window.location.hash == "#iframe") { - // This page is loaded from chrome://inspect. - sendToInspectPage(live_registrations, partition_id); - return; - } var unregistered_registrations = []; var unregistered_versions = []; getUnregisteredWorkers(stored_registrations, |