Permalink
Browse files

atopwi side of clean up for extension panels

  • Loading branch information...
1 parent 372707f commit 296f252c7649b60a7de5e8e73bfa686aeb2a3a28 @johnjbarton committed Apr 12, 2012
Showing with 12 additions and 8 deletions.
  1. 0 .allow-devtools-save
  2. +8 −5 DevtoolsConnection.js
  3. +4 −3 devtoolsAdapter/extend.html
View
No changes.
View
@@ -14,8 +14,8 @@ function(appendFrame) {
openInspector: function(debuggee) {
this.debuggee = debuggee;
- var inspectorElt = this.showInspectorIframe();
- this.listenDebuggee(inspectorElt.contentWindow);
+ this.listenDebuggee();
+ this.showInspectorIframe();
},
showInspectorIframe: function() {
@@ -26,14 +26,17 @@ function(appendFrame) {
},
listenDebuggee: function() {
- this.devtools = new RESTChannel.Connection();
+ if (debug) {
+ console.log("DevtoolsConnection listening ");
+ }
this.onUnload = RESTChannel.listen(
- this.devtools,
+ window,
this.sendDebuggeeSpec.bind(this)
);
},
- sendDebuggeeSpec: function() {
+ sendDebuggeeSpec: function(connection) {
+ this.devtools = connection;
this.devtools.putObject(
'debuggee',
this.debuggee,
@@ -1,10 +1,11 @@
<html><head>
<script src='../inspector/front-end/ExtensionAPI.js'></script>
-<script src='../inspector/front-end/ExtensionAPI.js'></script>
<script src='../../RESTChannel/RESTChannel.js'></script>
-<script src='../APIGeneration/trialAPI.js'></script>
-<script src='../devtoolsAdapter/extensionPanelRuntime.js'></script>
<script>
+// This code is loaded by 'options' settings in Sirius
+// It loads into devtools.html as a devtools extension.
+
+
chrome.devtools = injectedExtensionAPI('log');
chrome.devtools.panels.create("Log", '', '../Purple/devtools/panels/log.html', function() {
console.log('extend.html PANEL callback');

0 comments on commit 296f252

Please sign in to comment.