Permalink
Browse files

Merge pull request #69 from operasoftware/rchl-extension-name

DFL-3589 Implement extension name handling using info provided by CORE-41612
  • Loading branch information...
2 parents df70524 + 8df5401 commit cbe78242de26aee67ea8e4a803d37003188696ed @chriskr chriskr committed Sep 27, 2012
Showing with 6 additions and 3 deletions.
  1. +3 −1 src/ecma-debugger/runtimes.js
  2. +3 −2 src/window-manager/window-manager.js
@@ -10,13 +10,15 @@ cls.EcmascriptDebugger["6.0"].Runtime = function(runtime)
var OBJECT_ID = 3;
var URI = 4;
var DESCRIPTION = 5;
+ var EXTENSION_NAME = 7;
this.runtime_id = runtime[RUNTIME_ID];
this.html_frame_path = runtime[HTML_FRAME_PATH];
this.window_id = runtime[WINDOW_ID];
this.object_id = runtime[OBJECT_ID];
this.uri = runtime[URI];
this.description = runtime[DESCRIPTION];
+ this.extension_name = runtime[EXTENSION_NAME];
};
cls.EcmascriptDebugger["6.0"].Runtime.prototype = new URIPrototype("uri");
@@ -38,7 +40,7 @@ cls.EcmascriptDebugger["6.0"].ExtensionRuntime = function(rt)
this.type = "extension";
this.id = rt.runtime_id;
this.uri = rt.uri;
- this.title = "Extension Runtime " + rt.runtime_id;
+ this.title = "Extension" + (rt.extension_name ? ": " + rt.extension_name : " Runtime " + rt.runtime_id);
};
/**
@@ -41,8 +41,9 @@ cls.WindowManager["2.0"].WindowManagerData = function()
TITLE = 1,
WINDOW_TYPE = 2,
OPENER_ID = 3;
+ EXTENSION_NAME = 4;
*/
- return {window_id: win[0], title: win[1], window_type: win[2], opener_id: win[3]};
+ return {window_id: win[0], title: win[1], window_type: win[2], opener_id: win[3], extension_name: win[4]};
};
this._set_active_window_as_debug_context = function()
@@ -461,7 +462,7 @@ cls.WindowManager["2.0"].DebuggerMenu = function(id, class_name)
{
return (
["cst-option",
- win.title || "\u00A0",
+ win.extension_name || win.title || "\u00A0",
"opt-index", index,
"value", win.window_id.toString(),
"class", win.window_id == window_manager_data.get_debug_context() ?

0 comments on commit cbe7824

Please sign in to comment.