chrome/browser/ui/webui/chromeos/login/oobe_ui.cc - Issue 1179323005: Polymer upgraded to 1.0 in login flow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 1179323005: Polymer upgraded to 1.0 in login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@polymer_pre_migration

Patch Set: Comments addressed. Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/chromeos/login/controller-pairing-screen.html ('K') | « chrome/browser/resources/chromeos/login/throbber_notice.js ('k') | chrome/test/data/chromeos/oobe_webui_browsertest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

index 50e398ad5182f7d32445de330c5282b2b76848df..83d3f03e082558b054c0ebf5ec8ed3790f3a5a5b 100644

--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -83,6 +83,7 @@ const char kOobeJSPath[] = "oobe.js";

const char kKeyboardUtilsJSPath[] = "keyboard_utils.js";

const char kCustomElementsHTMLPath[] = "custom_elements.html";

const char kCustomElementsJSPath[] = "custom_elements.js";

+const char kPolymerConfigJSPath[] = "polymer_config.js";

// Paths for deferred resource loading.

const char kEnrollmentHTMLPath[] = "enrollment.html";

@@ -112,6 +113,7 @@ content::WebUIDataSource* CreateOobeUIDataSource(

source->AddResourcePath(kCustomElementsJSPath,

IDR_CUSTOM_ELEMENTS_LOGIN_JS);

}

+ source->AddResourcePath(kPolymerConfigJSPath, IDR_POLYMER_CONFIG_JS);

source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);

source->OverrideContentSecurityPolicyFrameSrc(

base::StringPrintf(