Chromium Code Reviews| 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 2d4f47f469b14e876daa9b3abacd0c223205361d..063058c7373b99a1bfdfe8bf9ef2b4bfb9688c6b 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| @@ -72,12 +72,15 @@ const char kLoginJSPath[] = "login.js"; |
| const char kOobeJSPath[] = "oobe.js"; |
| const char kKeyboardUtilsJSPath[] = "keyboard_utils.js"; |
| const char kDemoUserLoginJSPath[] = "demo_user_login.js"; |
| +const char kCustomElementsHTMLPath[] = "custom_elements.html"; |
| +const char kCustomElementsJSPath[] = "custom_elements.js"; |
| // Paths for deferred resource loading. |
| const char kEnrollmentHTMLPath[] = "enrollment.html"; |
| const char kEnrollmentCSSPath[] = "enrollment.css"; |
| const char kEnrollmentJSPath[] = "enrollment.js"; |
| + |
|
merkulova
2014/10/16 09:30:38
nit: remove the line
|
| void AddPolymerResourcesPaths(content::WebUIDataSource* source) { |
| for (const auto& mapping: GetPolymerResourcesMap()) |
| source->AddResourcePath(mapping.first, mapping.second); |
| @@ -117,8 +120,13 @@ content::WebUIDataSource* CreateOobeUIDataSource( |
| if (display_type == OobeUI::kOobeDisplay) { |
| AddPolymerResourcesPaths(source); |
| + source->AddResourcePath(kCustomElementsHTMLPath, IDR_CUSTOM_ELEMENTS_HTML); |
| + source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_JS); |
| + |
| source->AddResourcePath("Roboto-Thin.ttf", IDR_FONT_ROBOTO_THIN); |
| source->AddResourcePath("Roboto-Light.ttf", IDR_FONT_ROBOTO_LIGHT); |
| + source->AddResourcePath("Roboto-Regular.ttf", IDR_FONT_ROBOTO_REGULAR); |
| + source->AddResourcePath("Roboto-Medium.ttf", IDR_FONT_ROBOTO_MEDIUM); |
| source->AddResourcePath("Roboto-Bold.ttf", IDR_FONT_ROBOTO_BOLD); |
| } |