Add devtools panel with enable / disable switch, make recording per-tab.

jsha · jsha · commit 808fc3f63235 · 2014-01-01T00:52:51.000-05:00
diff --git a/chromium/background.js b/chromium/background.js
@@ -1,5 +1,5 @@
 // TODO: This keeps around history across "clear history" events. Fix that.
-var switchPlannerMode = true;
+var switchPlannerEnabledFor = {};
 var switchPlannerInfo = {};
   console.log("XXX TESTING XXX");
 
@@ -147,7 +147,7 @@ function onBeforeRequest(details) {
 
   // In Switch Planner Mode, record any non-rewriteable
   // HTTP URIs by parent hostname, along with the resource type.
-  if (switchPlannerMode && uri.protocol() !== "https") {
+  if (uri.protocol() !== "https") {
     // In order to figure out the document requesting this resource,
     // have to get the tab. TODO: any cheaper way?
     // XXX: Because this is async it's actually inaccurate during quick page
@@ -406,3 +406,14 @@ chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId) {
 // Listen for cookies set/updated and secure them if applicable. This function is async/nonblocking,
 // so we also use onBeforeSendHeaders to prevent a small window where cookies could be stolen.
 chrome.cookies.onChanged.addListener(onCookieChanged);
+
+// Listen for connection from the DevTools panel so we can set up communication.
+chrome.runtime.onMessage.addListener(function(message){
+  console.log(message);
+  if (message.hasOwnProperty('enable')) {
+    var enable = message.enable;
+    switchPlannerEnabledFor[message.tabId] = enable;
+    if (!enable)
+      switchPlannerInfo = {};
+  }
+});
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -28,6 +28,7 @@
         "default_popup": "popup.html", 
         "default_title": "__MSG_about_ext_name__"
     }, 
+    "devtools_page": "devtools.html",
     "permissions": [
         "webRequest", 
         "webRequestBlocking", 
diff --git a/chromium/popup.js b/chromium/popup.js
@@ -62,7 +62,7 @@ function createRuleLine(ruleset) {
 }
 
 function gotTab(tab) {
-  if (backgroundPage.switchPlannerMode) {
+  if (backgroundPage.switchPlannerEnabledFor[tab.id]) {
     // XXX: Call URI here, but it's not in-scope. Need to make it in-scope.
     var tab_hostname = tab.url.match(/https?:\/\/([^\/]*)/)[1];
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function createRuleLine(ruleset) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`function gotTab(tab) {`
`65`		`- if (backgroundPage.switchPlannerMode) {`
	`65`	`+ if (backgroundPage.switchPlannerEnabledFor[tab.id]) {`
`66`	`66`	`// XXX: Call URI here, but it's not in-scope. Need to make it in-scope.`
`67`	`67`	`var tab_hostname = tab.url.match(/https?:\/\/([^\/]*)/)[1];`
`68`	`68`