| 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 d3220c2c393022eb3dbae6639e50713f7f3385df..bfb8ae34696f3a56efcc16f62424c65ea485fec9 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
|
| @@ -35,6 +35,7 @@
|
| #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
|
| +#include "chrome/browser/ui/webui/chromeos/login/polymer_resources_map.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h"
|
| @@ -50,6 +51,7 @@
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| #include "grit/browser_resources.h"
|
| +#include "grit/chrome_unscaled_resources.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/webui/web_ui_util.h"
|
|
|
| @@ -76,6 +78,14 @@ const char kEnrollmentHTMLPath[] = "enrollment.html";
|
| const char kEnrollmentCSSPath[] = "enrollment.css";
|
| const char kEnrollmentJSPath[] = "enrollment.js";
|
|
|
| +void AddPolymerResourcesPaths(content::WebUIDataSource* source) {
|
| + const std::vector<std::pair<std::string, int>>& resources =
|
| + GetPolymerResourcesMap();
|
| + for (size_t i = 0; i < resources.size(); ++i) {
|
| + source->AddResourcePath(resources[i].first, resources[i].second);
|
| + }
|
| +}
|
| +
|
| // Creates a WebUIDataSource for chrome://oobe
|
| content::WebUIDataSource* CreateOobeUIDataSource(
|
| const base::DictionaryValue& localized_strings,
|
| @@ -109,6 +119,13 @@ content::WebUIDataSource* CreateOobeUIDataSource(
|
| source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
|
| source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
|
|
|
| + if (display_type == OobeUI::kOobeDisplay) {
|
| + AddPolymerResourcesPaths(source);
|
| + source->AddResourcePath("Roboto-Thin.ttf", IDR_FONT_ROBOTO_THIN);
|
| + source->AddResourcePath("Roboto-Light.ttf", IDR_FONT_ROBOTO_LIGHT);
|
| + source->AddResourcePath("Roboto-Bold.ttf", IDR_FONT_ROBOTO_BOLD);
|
| + }
|
| +
|
| return source;
|
| }
|
|
|
|
|