| Index: third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html
|
| diff --git a/third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html b/third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html
|
| index f9b8e01b24651daea7ede8ac7e22d050f2dd361d..67bd97dde60e6a34442ad416579a232cc53ba206 100644
|
| --- a/third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html
|
| +++ b/third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html
|
| @@ -16,7 +16,7 @@ function initialize_extensionsPanelTest()
|
| {
|
| InspectorTest.getPanelSize = function()
|
| {
|
| - var boundingRect = WebInspector.inspectorView._tabbedPane._contentElement.getBoundingClientRect();
|
| + var boundingRect = UI.inspectorView._tabbedPane._contentElement.getBoundingClientRect();
|
| return {
|
| width: boundingRect.width,
|
| height: boundingRect.height
|
| @@ -25,7 +25,7 @@ function initialize_extensionsPanelTest()
|
|
|
| InspectorTest.dumpStatusBarButtons = function()
|
| {
|
| - var panel = WebInspector.inspectorView.currentPanelDeprecated();
|
| + var panel = UI.inspectorView.currentPanelDeprecated();
|
| var items = panel._panelToolbar._contentElement.children;
|
| InspectorTest.addResult("Status bar buttons state:");
|
| for (var i = 0; i < items.length; ++i) {
|
| @@ -38,13 +38,13 @@ function initialize_extensionsPanelTest()
|
| }
|
| // Strip url(...) and prefix of the URL within, leave just last 3 components.
|
| var url = item.style.backgroundImage.replace(/^url\(.*(([/][^/]*){3}[^/)]*)\)$/, "...$1");
|
| - InspectorTest.addResult("status bar item " + i + ", icon: \"" + url + ", tooltip: '" + item[WebInspector.Tooltip._symbol].content + "', disabled: " + item.disabled);
|
| + InspectorTest.addResult("status bar item " + i + ", icon: \"" + url + ", tooltip: '" + item[UI.Tooltip._symbol].content + "', disabled: " + item.disabled);
|
| }
|
| }
|
|
|
| InspectorTest.clickButton = function(index)
|
| {
|
| - var panel = WebInspector.inspectorView.currentPanelDeprecated();
|
| + var panel = UI.inspectorView.currentPanelDeprecated();
|
| var items = panel._panelToolbar._contentElement.children;
|
| for (var i = 0, buttonIndex = 0; i < items.length; ++i) {
|
| if (items[i] instanceof HTMLButtonElement) {
|
| @@ -64,18 +64,18 @@ function initialize_extensionsPanelTest()
|
| InspectorTest.disableConsoleViewport();
|
| InspectorTest.evaluateInPage("logMessage()");
|
| var wrappedConsoleMessageAdded = InspectorTest.safeWrap(consoleMessageAdded);
|
| - WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
|
| + SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
|
|
|
| function consoleMessageAdded()
|
| {
|
| - WebInspector.multitargetConsoleModel.removeEventListener(WebInspector.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
|
| - WebInspector.ConsoleView.instance()._viewportThrottler.flush();
|
| + SDK.multitargetConsoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
|
| + Console.ConsoleView.instance()._viewportThrottler.flush();
|
| InspectorTest.deprecatedRunAfterPendingDispatches(clickOnMessage)
|
| }
|
|
|
| function clickOnMessage()
|
| {
|
| - var xpathResult = document.evaluate("//a[starts-with(., 'extensions-panel.html')]", WebInspector.ConsoleView.instance()._viewport.element, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null);
|
| + var xpathResult = document.evaluate("//a[starts-with(., 'extensions-panel.html')]", Console.ConsoleView.instance()._viewport.element, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null);
|
|
|
| var click = document.createEvent("MouseEvent");
|
| click.initMouseEvent("click", true, true);
|
| @@ -91,9 +91,9 @@ function initialize_extensionsPanelTest()
|
| InspectorTest.addResult("Showing resource " + url + " in panel " + panelName + "), line: " + lineNumber);
|
| }
|
| InspectorTest.recordNetwork();
|
| - InspectorTest.addSniffer(WebInspector.panels.sources, "showUILocation", showUILocationHook, true);
|
| - InspectorTest.addSniffer(WebInspector.panels.resources, "showResource", showResourceHook, true);
|
| - InspectorTest.addSniffer(WebInspector.panels.network, "revealAndHighlightRequest", showRequestHook, true);
|
| + InspectorTest.addSniffer(UI.panels.sources, "showUILocation", showUILocationHook, true);
|
| + InspectorTest.addSniffer(UI.panels.resources, "showResource", showResourceHook, true);
|
| + InspectorTest.addSniffer(UI.panels.network, "revealAndHighlightRequest", showRequestHook, true);
|
|
|
| function showUILocationHook(uiLocation)
|
| {
|
| @@ -113,8 +113,8 @@ function initialize_extensionsPanelTest()
|
|
|
| InspectorTest.switchToLastPanel = function()
|
| {
|
| - var lastPanelName = WebInspector.inspectorView._tabbedPane._tabs.peekLast().id;
|
| - return WebInspector.inspectorView.showPanel(lastPanelName);
|
| + var lastPanelName = UI.inspectorView._tabbedPane._tabs.peekLast().id;
|
| + return UI.inspectorView.showPanel(lastPanelName);
|
| }
|
| }
|
|
|
| @@ -192,7 +192,7 @@ function extension_testCreatePanel(nextTest)
|
| panel.show();
|
| }
|
| webInspector.panels.setOpenResourceHandler(handleOpenResource);
|
| - evaluateOnFrontend("WebInspector.openAnchorLocationRegistry._activeHandler = 'test extension'");
|
| + evaluateOnFrontend("Components.openAnchorLocationRegistry._activeHandler = 'test extension'");
|
| evaluateOnFrontend("InspectorTest.logMessageAndClickOnURL();");
|
| expectOnShown = true;
|
| }
|
| @@ -222,7 +222,7 @@ function extension_testSearch(nextTest)
|
|
|
| function performSearch(query)
|
| {
|
| - WebInspector.inspectorView.panel("file://TestPanelforsearch").then(panel => {
|
| + UI.inspectorView.panel("file://TestPanelforsearch").then(panel => {
|
| panel.searchableView().showSearchField();
|
| panel.searchableView()._searchInputElement.value = query;
|
| panel.searchableView()._performSearch(true, true);
|
| @@ -297,7 +297,7 @@ function extension_testGlobalShortcuts(nextTest)
|
| {
|
| var platform;
|
| var testPanel;
|
| - evaluateOnFrontend("reply(WebInspector.platform())", function(result) {
|
| + evaluateOnFrontend("reply(Host.platform())", function(result) {
|
| platform = result;
|
| var basePath = location.pathname.replace(/\/[^/]*$/, "/");
|
| webInspector.panels.create("Shortcuts Test Panel", basePath + "extension-panel.png", basePath + "extension-panel.html", onPanelCreated);
|
| @@ -326,7 +326,7 @@ function extension_testGlobalShortcuts(nextTest)
|
| {
|
| panelWindow.removeEventListener("resize", onPanelResized);
|
| output("Panel resized, test passed.");
|
| - evaluateOnFrontend("reply(WebInspector.inspectorView._closeDrawer())", nextTest);
|
| + evaluateOnFrontend("reply(UI.inspectorView._closeDrawer())", nextTest);
|
| }
|
| }
|
|
|
|
|