| Index: third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| index 13d8f2b83317a1daffc211be9bc65213432e40a0..ba90e89bc782967d74163287be4c71e7b6565987 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| @@ -31,26 +31,15 @@
|
| /**
|
| * @constructor
|
| * @implements {InspectorAgent.Dispatcher}
|
| - * @implements {WebInspector.Console.UIDelegate}
|
| * @suppressGlobalPropertiesCheck
|
| */
|
| WebInspector.Main = function()
|
| {
|
| - WebInspector.console.setUIDelegate(this);
|
| WebInspector.Main._instanceForTest = this;
|
| runOnWindowLoad(this._loaded.bind(this));
|
| }
|
|
|
| WebInspector.Main.prototype = {
|
| - /**
|
| - * @override
|
| - * @return {!Promise.<undefined>}
|
| - */
|
| - showConsole: function()
|
| - {
|
| - return WebInspector.Revealer.revealPromise(WebInspector.console);
|
| - },
|
| -
|
| _loaded: function()
|
| {
|
| console.timeStamp("Main._loaded");
|
| @@ -156,7 +145,7 @@ WebInspector.Main.prototype = {
|
|
|
| var canDock = !!Runtime.queryParam("can_dock");
|
| WebInspector.zoomManager = new WebInspector.ZoomManager(window, InspectorFrontendHost);
|
| - WebInspector.inspectorView = new WebInspector.InspectorView();
|
| + WebInspector.inspectorView = WebInspector.InspectorView.instance();
|
| WebInspector.ContextMenu.initialize();
|
| WebInspector.ContextMenu.installHandler(document);
|
| WebInspector.Tooltip.installHandler(document);
|
| @@ -846,7 +835,7 @@ WebInspector.Main.MainMenuItem.prototype = {
|
| var descriptor = extension.descriptor();
|
| if (descriptor["location"] !== "drawer-view")
|
| continue;
|
| - moreTools.appendItem(extension.title(), WebInspector.inspectorView.showViewInDrawer.bind(WebInspector.inspectorView, descriptor["name"]));
|
| + moreTools.appendItem(extension.title(), WebInspector.viewManager.showView.bind(WebInspector.viewManager, descriptor["id"]));
|
| }
|
|
|
| contextMenu.show();
|
|
|