summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/docs/examples
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 08:46:30 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 08:46:30 +0000
commitc7580b6cc34348be847fe5f82f4ddb14f2c40a66 (patch)
treeab71659b600ff2e5e9eb004abe9c9a29a155fa09 /chrome/common/extensions/docs/examples
parent488e14bf4ff59f70efc1d2ebf39cf9c8391387e5 (diff)
downloadchromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.zip
chromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.tar.gz
chromium_src-c7580b6cc34348be847fe5f82f4ddb14f2c40a66.tar.bz2
DevTools: extend experimental.debugger API to potentially allow non-tab debuggees.
This change migrates from attach(tabId, ...) syntax to the attach({tabId:tabId}, ...) as suggested during the extension API review. BUG= TEST= Review URL: http://codereview.chromium.org/8341017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/docs/examples')
-rw-r--r--chrome/common/extensions/docs/examples/api/debugger/live-headers.zipbin4879 -> 4966 bytes
-rw-r--r--chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html4
-rw-r--r--chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html16
-rw-r--r--chrome/common/extensions/docs/examples/api/debugger/pause-resume.zipbin8929 -> 9139 bytes
-rw-r--r--chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html38
5 files changed, 35 insertions, 23 deletions
diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip b/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip
index 28e95f1..00cc7a7 100644
--- a/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip
+++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers.zip
Binary files differ
diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html b/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html
index a090e9b..e50a52f 100644
--- a/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html
+++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers/background.html
@@ -13,8 +13,10 @@ chrome.browserAction.onClicked.addListener(function() {
});
});
+var version = "0.1";
+
function actionClicked(tab) {
- chrome.experimental.debugger.attach(tab.id, onAttach.bind(null, tab.id));
+ chrome.experimental.debugger.attach({tabId:tab.id}, version, onAttach.bind(null, tab.id));
}
function onAttach(tabId) {
diff --git a/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html b/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html
index b50a793..8fa1bb8 100644
--- a/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html
+++ b/chrome/common/extensions/docs/examples/api/debugger/live-headers/headers.html
@@ -22,23 +22,27 @@ body {
}
</style>
+
<script>
var tabId = parseInt(window.location.search.substring(1));
window.addEventListener("load", function() {
- chrome.experimental.debugger.sendRequest(tabId, "Network.enable");
+ chrome.experimental.debugger.sendCommand({tabId:tabId}, "Network.enable");
chrome.experimental.debugger.onEvent.addListener(onEvent);
});
window.addEventListener("unload", function() {
- chrome.experimental.debugger.detach(tabId);
+ chrome.experimental.debugger.detach({tabId:tabId});
});
var requests = {};
-function onEvent(tabId, message, params) {
- if (message === "Network.requestWillBeSent") {
+function onEvent(debuggeeId, message, params) {
+ if (tabId != debuggeeId.tabId)
+ return;
+
+ if (message == "Network.requestWillBeSent") {
var requestDiv = requests[params.requestId];
if (!requestDiv) {
var requestDiv = document.createElement("div");
@@ -57,7 +61,7 @@ function onEvent(tabId, message, params) {
parseURL(params.request.url).path + " HTTP/1.1";
requestDiv.appendChild(requestLine);
document.getElementById("container").appendChild(requestDiv);
- } else if (message === "Network.responseReceived") {
+ } else if (message == "Network.responseReceived") {
appendResponse(params.requestId, params.response);
}
}
@@ -98,7 +102,7 @@ function parseURL(url) {
</script>
</head>
-<body onload="onLoad()">
+<body>
<div id="container"></div>
</body>
</html>
diff --git a/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip b/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip
index 5ae45f6..335ca94 100644
--- a/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip
+++ b/chrome/common/extensions/docs/examples/api/debugger/pause-resume.zip
Binary files differ
diff --git a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html
index 2b26a76..51b684a 100644
--- a/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html
+++ b/chrome/common/extensions/docs/examples/api/debugger/pause-resume/background.html
@@ -9,6 +9,7 @@ found in the LICENSE file.
<script>
var attachedTabs = {};
+var version = "0.1";
chrome.experimental.debugger.onEvent.addListener(onEvent);
chrome.experimental.debugger.onDetach.addListener(onDetach);
@@ -21,45 +22,50 @@ chrome.browserAction.onClicked.addListener(function() {
function actionClicked(tab) {
var tabId = tab.id;
- if (attachedTabs[tabId] === "pausing")
+ var debuggeeId = {tabId:tabId};
+
+ if (attachedTabs[tabId] == "pausing")
return;
if (!attachedTabs[tabId])
- chrome.experimental.debugger.attach(tabId, onAttach.bind(null, tabId));
+ chrome.experimental.debugger.attach(debuggeeId, version, onAttach.bind(null, debuggeeId));
else if (attachedTabs[tabId])
- chrome.experimental.debugger.detach(tabId, onDetach.bind(null, tabId));
+ chrome.experimental.debugger.detach(debuggeeId, onDetach.bind(null, debuggeeId));
}
-function onAttach(tabId) {
+function onAttach(debuggeeId) {
if (chrome.extension.lastError) {
alert("Another debugger is already attached to this tab.");
return;
}
+ var tabId = debuggeeId.tabId;
chrome.browserAction.setIcon({tabId: tabId, path:"debuggerPausing.png"});
chrome.browserAction.setTitle({tabId: tabId, title:"Pausing JavaScript"});
attachedTabs[tabId] = "pausing";
- chrome.experimental.debugger.sendRequest(
- tabId, "Debugger.enable", {},
- onDebuggerEnabled.bind(null, tabId));
+ chrome.experimental.debugger.sendCommand(
+ debuggeeId, "Debugger.enable", {},
+ onDebuggerEnabled.bind(null, debuggeeId));
}
-function onDebuggerEnabled(tabId) {
- chrome.experimental.debugger.sendRequest(tabId, "Debugger.pause");
+function onDebuggerEnabled(debuggeeId) {
+ chrome.experimental.debugger.sendCommand(debuggeeId, "Debugger.pause");
}
-function onEvent(tabId, method) {
- if (method === "Debugger.paused") {
+function onEvent(debuggeeId, method) {
+ var tabId = debuggeeId.tabId;
+ if (method == "Debugger.paused") {
attachedTabs[tabId] = "paused";
- chrome.browserAction.setIcon({tabId: tabId, path:"debuggerContinue.png"});
- chrome.browserAction.setTitle({tabId: tabId, title:"Resume JavaScript"});
+ chrome.browserAction.setIcon({tabId:tabId, path:"debuggerContinue.png"});
+ chrome.browserAction.setTitle({tabId:tabId, title:"Resume JavaScript"});
}
}
-function onDetach(tabId) {
+function onDetach(debuggeeId) {
+ var tabId = debuggeeId.tabId;
delete attachedTabs[tabId];
- chrome.browserAction.setIcon({tabId: tabId, path:"debuggerPause.png"});
- chrome.browserAction.setTitle({tabId: tabId, title:"Pause JavaScript"});
+ chrome.browserAction.setIcon({tabId:tabId, path:"debuggerPause.png"});
+ chrome.browserAction.setTitle({tabId:tabId, title:"Pause JavaScript"});
}
</script>
generated by cgit v1.1 at 2025-05-20 20:17:12 +0000