Commit 2751406c authored by rbpotter's avatar rbpotter Committed by Commit Bot

Refactor Print Preview UI string additions

Bug: 773928
Change-Id: Ice29884177038148769c1a6c0edf037220bdc814
Reviewed-on: https://chromium-review.googlesource.com/745442
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512741}
parent 3266e2f5
......@@ -165,22 +165,7 @@ bool HandleRequestCallback(
return true;
}
content::WebUIDataSource* CreateNewPrintPreviewUISource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIPrintHost);
source->SetJsonPath("strings.js");
for (size_t i = 0; i < kPrintPreviewResourcesSize; ++i) {
source->AddResourcePath(kPrintPreviewResources[i].name,
kPrintPreviewResources[i].value);
}
source->SetDefaultResource(IDR_PRINT_PREVIEW_NEW_HTML);
return source;
}
content::WebUIDataSource* CreatePrintPreviewUISource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIPrintHost);
void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedString("title", IDS_PRINT_PREVIEW_TITLE);
source->AddLocalizedString("loading", IDS_PRINT_PREVIEW_LOADING);
source->AddLocalizedString("noPlugin", IDS_PRINT_PREVIEW_NO_PLUGIN);
......@@ -355,38 +340,6 @@ content::WebUIDataSource* CreatePrintPreviewUISource(Profile* profile) {
"groupPrinterSharingInviteText", IDS_PRINT_PREVIEW_GROUP_INVITE_TEXT);
source->AddLocalizedString(
"printerSharingInviteText", IDS_PRINT_PREVIEW_INVITE_TEXT);
source->SetJsonPath("strings.js");
source->AddResourcePath("print_preview.js", IDR_PRINT_PREVIEW_JS);
source->AddResourcePath("pdf_preview.html",
IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML);
source->AddResourcePath("images/1x/printer.png",
IDR_PRINT_PREVIEW_IMAGES_1X_PRINTER);
source->AddResourcePath("images/2x/printer.png",
IDR_PRINT_PREVIEW_IMAGES_2X_PRINTER);
source->AddResourcePath("images/1x/printer_shared.png",
IDR_PRINT_PREVIEW_IMAGES_1X_PRINTER_SHARED);
source->AddResourcePath("images/2x/printer_shared.png",
IDR_PRINT_PREVIEW_IMAGES_2X_PRINTER_SHARED);
source->AddResourcePath("images/business.svg",
IDR_PRINT_PREVIEW_IMAGES_ENTERPRISE_PRINTER);
source->AddResourcePath("images/third_party.png",
IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY);
source->AddResourcePath("images/google_doc.png",
IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC);
source->AddResourcePath("images/pdf.png", IDR_PRINT_PREVIEW_IMAGES_PDF);
source->AddResourcePath("images/mobile.png", IDR_PRINT_PREVIEW_IMAGES_MOBILE);
source->AddResourcePath("images/mobile_shared.png",
IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED);
source->SetDefaultResource(IDR_PRINT_PREVIEW_HTML);
source->SetRequestFilter(base::Bind(&HandleRequestCallback));
source->OverrideContentSecurityPolicyScriptSrc(
base::StringPrintf("script-src chrome://resources 'self' 'unsafe-eval' "
"chrome-extension://%s;",
extension_misc::kPdfExtensionId));
source->OverrideContentSecurityPolicyChildSrc("child-src 'self';");
source->DisableDenyXFrameOptions();
source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
source->AddLocalizedString("moreOptionsLabel", IDS_MORE_OPTIONS_LABEL);
source->AddLocalizedString("lessOptionsLabel", IDS_LESS_OPTIONS_LABEL);
#if defined(OS_CHROMEOS)
......@@ -406,7 +359,30 @@ content::WebUIDataSource* CreatePrintPreviewUISource(Profile* profile) {
source->AddLocalizedString("openPdfInPreviewOption",
IDS_PRINT_PREVIEW_OPEN_PDF_IN_PREVIEW_APP);
#endif
}
void AddPrintPreviewImages(content::WebUIDataSource* source) {
source->AddResourcePath("images/1x/printer.png",
IDR_PRINT_PREVIEW_IMAGES_1X_PRINTER);
source->AddResourcePath("images/2x/printer.png",
IDR_PRINT_PREVIEW_IMAGES_2X_PRINTER);
source->AddResourcePath("images/1x/printer_shared.png",
IDR_PRINT_PREVIEW_IMAGES_1X_PRINTER_SHARED);
source->AddResourcePath("images/2x/printer_shared.png",
IDR_PRINT_PREVIEW_IMAGES_2X_PRINTER_SHARED);
source->AddResourcePath("images/business.svg",
IDR_PRINT_PREVIEW_IMAGES_ENTERPRISE_PRINTER);
source->AddResourcePath("images/third_party.png",
IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY);
source->AddResourcePath("images/google_doc.png",
IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC);
source->AddResourcePath("images/pdf.png", IDR_PRINT_PREVIEW_IMAGES_PDF);
source->AddResourcePath("images/mobile.png", IDR_PRINT_PREVIEW_IMAGES_MOBILE);
source->AddResourcePath("images/mobile_shared.png",
IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED);
}
void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {
#if !defined(OS_MACOSX) && !defined(OS_WIN)
bool print_pdf_as_image_enabled = base::FeatureList::IsEnabled(
features::kPrintPdfAsImage);
......@@ -423,6 +399,40 @@ content::WebUIDataSource* CreatePrintPreviewUISource(Profile* profile) {
source->AddBoolean("useSystemDefaultPrinter", system_default_printer);
#endif
source->AddBoolean("showLocalManageButton", true);
}
content::WebUIDataSource* CreateNewPrintPreviewUISource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIPrintHost);
AddPrintPreviewStrings(source);
source->SetJsonPath("strings.js");
for (size_t i = 0; i < kPrintPreviewResourcesSize; ++i) {
source->AddResourcePath(kPrintPreviewResources[i].name,
kPrintPreviewResources[i].value);
}
source->SetDefaultResource(IDR_PRINT_PREVIEW_NEW_HTML);
return source;
}
content::WebUIDataSource* CreatePrintPreviewUISource(Profile* profile) {
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIPrintHost);
AddPrintPreviewStrings(source);
source->SetJsonPath("strings.js");
source->AddResourcePath("print_preview.js", IDR_PRINT_PREVIEW_JS);
source->AddResourcePath("pdf_preview.html",
IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML);
AddPrintPreviewImages(source);
source->SetDefaultResource(IDR_PRINT_PREVIEW_HTML);
source->SetRequestFilter(base::Bind(&HandleRequestCallback));
source->OverrideContentSecurityPolicyScriptSrc(
base::StringPrintf("script-src chrome://resources 'self' 'unsafe-eval' "
"chrome-extension://%s;",
extension_misc::kPdfExtensionId));
source->OverrideContentSecurityPolicyChildSrc("child-src 'self';");
source->DisableDenyXFrameOptions();
source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
AddPrintPreviewFlags(source, profile);
return source;
}
......
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