Skip to content

GitLab

T
tangled
Commit 993cb35c authored by rbpotter's avatar rbpotter Committed by Commit Bot
Browse files
Options

Reland Extensions Web UI: Use HTML Imports Polyfill 

Bug: 925517
Change-Id: Ie8ddb24d361931266d2e3872b3692a39df67f2d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1597643Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#657317}
parent aa58cfd8
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 49 deletions
chrome/browser/resources/extensions/BUILD.gn
View file @ 993cb35c
...@@ -17,6 +17,7 @@ optimize_webui("build") { ...@@ -17,6 +17,7 @@ optimize_webui("build") {
insert_in_head = "<base href=\"chrome://extensions\">" insert_in_head = "<base href=\"chrome://extensions\">"
input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir) input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
js_out_files = [ "crisper.js" ] js_out_files = [ "crisper.js" ]
replace_for_html_imports_polyfill = "crisper.js"
deps = [ deps = [
":unpak", ":unpak",
......
chrome/browser/resources/extensions/extensions.html
View file @ 993cb35c
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
</style> </style>
</head> </head>
<body> <body>
<script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js">
</script>
<extensions-manager></extensions-manager> <extensions-manager></extensions-manager>
<link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<link rel="import" href="chrome://extensions/manager.html"> <link rel="import" href="chrome://extensions/manager.html">
......
chrome/browser/resources/extensions/icons.html
View file @ 993cb35c
...@@ -6,14 +6,7 @@ ...@@ -6,14 +6,7 @@
<defs> <defs>
<!-- Custom SVG (bettes). --> <!-- Custom SVG (bettes). -->
<g id="unpacked"> <g id="unpacked">
<defs> <path class="cls-1" fill="none" d="M0,0H24V24H0V0Z"></path>
<style>
.cls-1 {
fill: none;
}
</style>
</defs>
<path class="cls-1" d="M0,0H24V24H0V0Z"></path>
<circle cx="9" cy="12" r="1"></circle> <circle cx="9" cy="12" r="1"></circle>
<path d="M20,5H4A2,2,0,0,0,2,7V17a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V7A2,2,0,0,0,20,5ZM9,17a5,5,0,1,1,5-5A5,5,0,0,1,9,17Zm11,1a1,1,0,1,1,1-1A1,1,0,0,1,20,18ZM20,8a1,1,0,1,1,1-1A1,1,0,0,1,20,8Z"></path> <path d="M20,5H4A2,2,0,0,0,2,7V17a2,2,0,0,0,2,2H20a2,2,0,0,0,2-2V7A2,2,0,0,0,20,5ZM9,17a5,5,0,1,1,5-5A5,5,0,0,1,9,17Zm11,1a1,1,0,1,1,1-1A1,1,0,0,1,20,18ZM20,8a1,1,0,1,1,1-1A1,1,0,0,1,20,8Z"></path>
</g> </g>
......
chrome/browser/ui/webui/extensions/extensions_ui.cc
View file @ 993cb35c
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "extensions/common/extension_urls.h" #include "extensions/common/extension_urls.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/webui_resources.h"
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
...@@ -348,6 +349,9 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, ...@@ -348,6 +349,9 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile,
source->AddResourcePath(kExtensionsResources[i].name, source->AddResourcePath(kExtensionsResources[i].name,
kExtensionsResources[i].value); kExtensionsResources[i].value);
} }
// Add the subpage loader, to load subpages in non-optimized builds.
source->AddResourcePath("subpage_loader.html", IDR_WEBUI_HTML_SUBPAGE_LOADER);
source->AddResourcePath("subpage_loader.js", IDR_WEBUI_JS_SUBPAGE_LOADER);
source->SetDefaultResource(IDR_EXTENSIONS_EXTENSIONS_HTML); source->SetDefaultResource(IDR_EXTENSIONS_EXTENSIONS_HTML);
#endif #endif
......
chrome/renderer/chrome_content_renderer_client.cc
View file @ 993cb35c
...@@ -1602,9 +1602,9 @@ bool ChromeContentRendererClient::RequiresHtmlImports(const GURL& url) { ...@@ -1602,9 +1602,9 @@ bool ChromeContentRendererClient::RequiresHtmlImports(const GURL& url) {
// Imports Polyfill so that they will not require native imports. Return true // Imports Polyfill so that they will not require native imports. Return true
// for only pages that have not been updated yet. See // for only pages that have not been updated yet. See
// https://crbug.com/937747. // https://crbug.com/937747.
bool canUsePolyfill = false; bool canUsePolyfill = url.host() == chrome::kChromeUIExtensionsHost;
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
canUsePolyfill = url.host() == chrome::kChromeUIPrintHost; canUsePolyfill |= url.host() == chrome::kChromeUIPrintHost;
#endif #endif
return url.SchemeIs(content::kChromeUIScheme) && !canUsePolyfill; return url.SchemeIs(content::kChromeUIScheme) && !canUsePolyfill;
} }
chrome/test/data/webui/extensions/cr_extensions_browsertest.js
View file @ 993cb35c
...@@ -45,6 +45,25 @@ const CrExtensionsBrowserTest = class extends PolymerTest { ...@@ -45,6 +45,25 @@ const CrExtensionsBrowserTest = class extends PolymerTest {
return null; return null;
} }
/** @override */
get loaderFile() {
return 'subpage_loader.html';
}
// The name of the custom element under test. Should be overridden by
// subclasses that are loading the URL of a non-element.
get customElementName() {
const r = /chrome\:\/\/extensions\/(([a-zA-Z-_]+)\/)?([a-zA-Z-_]+)\.html/;
const result = r.exec(this.browsePreload);
if (result && result.length > 3) {
const element = result[3].replace(/_/gi, '-');
return result[2] === undefined ? 'extensions-' + element : element;
}
// Loading the main page, return extensions manager.
return 'extensions-manager';
}
/** @param {string} testName The name of the test to run. */ /** @param {string} testName The name of the test to run. */
runMochaTest(testName) { runMochaTest(testName) {
runMochaTest(this.suiteName, testName); runMochaTest(this.suiteName, testName);
...@@ -207,6 +226,12 @@ CrExtensionsActivityLogTest = class extends CrExtensionsBrowserTest { ...@@ -207,6 +226,12 @@ CrExtensionsActivityLogTest = class extends CrExtensionsBrowserTest {
'activity_log_test.js', 'activity_log_test.js',
]); ]);
} }
/** @override */
get customElementName() {
// This element's naming scheme is unusual.
return 'extensions-activity-log';
}
}; };
TEST_F('CrExtensionsActivityLogTest', 'All', () => { TEST_F('CrExtensionsActivityLogTest', 'All', () => {
...@@ -239,7 +264,7 @@ TEST_F('CrExtensionsActivityLogHistoryTest', 'All', () => { ...@@ -239,7 +264,7 @@ TEST_F('CrExtensionsActivityLogHistoryTest', 'All', () => {
CrExtensionsActivityLogHistoryItemTest = class extends CrExtensionsBrowserTest { CrExtensionsActivityLogHistoryItemTest = class extends CrExtensionsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return 'chrome://extensions/activity_log/activity_log_item.html'; return 'chrome://extensions/activity_log/activity_log_history_item.html';
} }
get extraLibraries() { get extraLibraries() {
...@@ -801,6 +826,12 @@ CrExtensionsNavigationHelperTest = class extends CrExtensionsBrowserTest { ...@@ -801,6 +826,12 @@ CrExtensionsNavigationHelperTest = class extends CrExtensionsBrowserTest {
get suiteName() { get suiteName() {
return extension_navigation_helper_tests.suiteName; return extension_navigation_helper_tests.suiteName;
} }
/** @override */
get customElementName() {
// This test is verifying a class, not a custom element.
return null;
}
}; };
TEST_F('CrExtensionsNavigationHelperTest', 'Basic', function() { TEST_F('CrExtensionsNavigationHelperTest', 'Basic', function() {
...@@ -826,8 +857,11 @@ TEST_F('CrExtensionsNavigationHelperTest', 'SupportedRoutes', function() { ...@@ -826,8 +857,11 @@ TEST_F('CrExtensionsNavigationHelperTest', 'SupportedRoutes', function() {
CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest { CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest {
/** @override */ /** @override */
get suiteName() { get extraLibraries() {
return 'ErrorConsoleTests'; return super.extraLibraries.concat([
'../settings/test_util.js',
'error_console_test.js',
]);
} }
/** @override */ /** @override */
...@@ -848,38 +882,8 @@ CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest { ...@@ -848,38 +882,8 @@ CrExtensionsErrorConsoleTest = class extends CrExtensionsBrowserTest {
} }
}; };
TEST_F('CrExtensionsErrorConsoleTest', 'TestUpDownErrors', function() { TEST_F('CrExtensionsErrorConsoleTest', 'TestUpDownErrors', () => {
const STACK_ERRORS = 'li'; mocha.run();
const ACTIVE_ERROR_IN_STACK = 'li[tabindex="0"]';
let initialFocus =
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0];
assertTrue(!!initialFocus);
assertEquals(
1,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK).length);
assertEquals(
4, extension_test_util.findMatches(document, STACK_ERRORS).length);
// Pressing up when the first item is focused should NOT change focus.
MockInteractions.keyDownOn(initialFocus, 38, '', 'ArrowUp');
assertEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
// Pressing down when the first item is focused should change focus.
MockInteractions.keyDownOn(initialFocus, 40, '', 'ArrowDown');
assertNotEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
// Pressing up when the second item is focused should focus the first again.
MockInteractions.keyDownOn(initialFocus, 38, '', 'ArrowUp');
assertEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
testDone();
}); });
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
chrome/test/data/webui/extensions/cr_extensions_interactive_ui_tests.js
View file @ 993cb35c
...@@ -27,6 +27,11 @@ const CrExtensionsInteractiveUITest = class extends PolymerInteractiveUITest { ...@@ -27,6 +27,11 @@ const CrExtensionsInteractiveUITest = class extends PolymerInteractiveUITest {
'../settings/test_util.js', '../settings/test_util.js',
]; ];
} }
/** @override */
get loaderFile() {
return 'subpage_loader.html';
}
}; };
...@@ -44,6 +49,12 @@ CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest { ...@@ -44,6 +49,12 @@ CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest {
]); ]);
} }
/** @override */
get customElementName() {
// Wait for the manager since this test is loading the main page.
return 'extensions-manager';
}
/** @override */ /** @override */
testGenPreamble() { testGenPreamble() {
GEN(' InstallExtensionWithInPageOptions();'); GEN(' InstallExtensionWithInPageOptions();');
......
chrome/test/data/webui/extensions/error_console_test.js 0 → 100644
View file @ 993cb35c
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/** @fileoverview Suite of tests for the extensions error console. */
suite('CrExtensionsErrorConsoleTest', function() {
const STACK_ERRORS = 'li';
const ACTIVE_ERROR_IN_STACK = 'li[tabindex="0"]';
// Initialize an extension activity log item before each test.
setup(function() {
return test_util.waitForRender(document);
});
test('TestUpDownErrors', function() {
let initialFocus =
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0];
assertTrue(!!initialFocus);
assertEquals(
1,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)
.length);
assertEquals(
4, extension_test_util.findMatches(document, STACK_ERRORS).length);
// Pressing up when the first item is focused should NOT change focus.
MockInteractions.keyDownOn(initialFocus, 38, '', 'ArrowUp');
assertEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
// Pressing down when the first item is focused should change focus.
MockInteractions.keyDownOn(initialFocus, 40, '', 'ArrowDown');
assertNotEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
// Pressing up when the second item is focused should focus the first again.
MockInteractions.keyDownOn(initialFocus, 38, '', 'ArrowUp');
assertEquals(
initialFocus,
extension_test_util.findMatches(document, ACTIVE_ERROR_IN_STACK)[0]);
});
});
chrome/test/data/webui/extensions/manager_test.js
View file @ 993cb35c
...@@ -30,7 +30,7 @@ cr.define('extension_manager_tests', function() { ...@@ -30,7 +30,7 @@ cr.define('extension_manager_tests', function() {
/** @param {string} viewElement */ /** @param {string} viewElement */
function assertViewActive(tagName) { function assertViewActive(tagName) {
expectTrue(!!manager.$.viewManager.querySelector(`${tagName}.active`)); assertTrue(!!manager.$.viewManager.querySelector(`${tagName}.active`));
} }
setup(function() { setup(function() {
......
chrome/test/data/webui/extensions/navigation_helper_test.js
View file @ 993cb35c
...@@ -31,9 +31,18 @@ cr.define('extension_navigation_helper_tests', function() { ...@@ -31,9 +31,18 @@ cr.define('extension_navigation_helper_tests', function() {
let navigationHelper; let navigationHelper;
setup(function() { setup(function() {
PolymerTest.clearBody(); // In release mode tests, we need to wait for the page to actually import
Polymer.dom.flush(); // the navigation_helper.html file, since the tests do not navigate there
navigationHelper = new extensions.NavigationHelper(); // directly. Wait for an element that imports this class to be defined.
const whenReady = ((typeof extensions !== 'undefined') &&
!!extensions.NavigationHelper) ?
Promise.resolve() :
customElements.whenDefined('extensions-manager');
return whenReady.then(() => {
PolymerTest.clearBody();
Polymer.dom.flush();
navigationHelper = new extensions.NavigationHelper();
});
}); });
test(assert(TestNames.Basic), function() { test(assert(TestNames.Basic), function() {
......
testing/buildbot/filters/webui_html_imports_polyfill_browser_tests.filter
View file @ 993cb35c
...@@ -3,6 +3,38 @@ ...@@ -3,6 +3,38 @@
# HTML imports feature turned off, before the Blink team disables the feature by # HTML imports feature turned off, before the Blink team disables the feature by
# default. # default.
# TODO(rbpotter): Restore this test to the list of tests below, after failures
# on Mac 10.13 have been fixed.
-CrExtensionsManagerTestWithMultipleExtensionTypesInstalled.*
CrExtensionsSidebarTest.*
CrExtensionsToolbarTest.*
CrExtensionsItemsTest.*
CrExtensionsActivityLogTest.*
CrExtensionsActivityLogHistoryTest.*
CrExtensionsActivityLogHistoryItemTest.*
CrExtensionsActivityLogStreamTest.*
CrExtensionsActivityLogStreamItemTest.*
CrExtensionsDetailViewTest.*
CrExtensionsItemListTest.*
CrExtensionsLoadErrorTest.*
CrExtensionsManagerUnitTest.*
CrExtensionsManagerUnitTestWithActivityLogFlag.*
CrExtensionsManagerTestWithIdQueryParam.*
CrExtensionsManagerTestWithActivityLogFlag.*
CrExtensionsShortcutTest.*
CrExtensionsShortcutInputTest.*
CrExtensionsPackDialogTest.*
CrExtensionsOptionsDialogTest.*
CrExtensionsErrorPageTest.*
CrExtensionsCodeSectionTest.*
CrExtensionsNavigationHelperTest.*
CrExtensionsErrorConsoleTest.*
CrExtensionsToggleRowTest.*
CrExtensionsKioskModeTest.*
CrExtensionsRuntimeHostPermissionsTest.*
CrExtensionsHostPermissionsToggleListTest.*
PDFAnnotationsTest.* PDFAnnotationsTest.*
PDFExtensionClipboardTest.* PDFExtensionClipboardTest.*
PDFExtensionHitTestTest.* PDFExtensionHitTestTest.*
......
testing/buildbot/filters/webui_html_imports_polyfill_interactive_ui_tests.filter
View file @ 993cb35c
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# HTML imports feature turned off, before the Blink team disables the feature by # HTML imports feature turned off, before the Blink team disables the feature by
# default. # default.
CrExtensionsOptionsPageTest.*
PrintPreviewButtonStripInteractiveTest.* PrintPreviewButtonStripInteractiveTest.*
PrintPreviewDestinationDialogInteractiveTest.* PrintPreviewDestinationDialogInteractiveTest.*
PrintPreviewNumberSettingsSectionInteractiveTest.BlurResetsEmptyInput PrintPreviewNumberSettingsSectionInteractiveTest.BlurResetsEmptyInput
......
ui/webui/resources/html/subpage_loader.html
View file @ 993cb35c
<meta charset="utf-8">
<script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js"> <script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js">
</script> </script>
<script src="subpage_loader.js"></script> <script src="subpage_loader.js"></script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment