Commit fcfd79f1 authored by dpapad's avatar dpapad Committed by Chromium LUCI CQ

PDF Viewer: Decouple build from Print Preview PDF UI resources.

Preparation for bundling the PDF Viewer's resources, step 1/3.

Specifically register Print Preview PDF resources as part of
c/b/r/print_preview:build_grd to decouple from PDF Viewer's build.

In the future, Print Preview's PDF resources can be bundled in
print_preview.rollup.js, if deemed beneficial.

Bug: 1163956
Change-Id: I8beeaa27f815ac4c1dc481bbd075a4a7e4865b05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625274
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842736}
parent 7bc4243f
......@@ -186,7 +186,24 @@ preprocess_if_expr("preprocess_pdf") {
in_folder = "../"
out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_pdf_manifest"
in_files = [ "pdf/index_pp.html" ]
in_files = [
"pdf/browser_api.js",
"pdf/constants.js",
"pdf/controller.js",
"pdf/gesture_detector.js",
"pdf/index.css",
"pdf/index_pp.html",
"pdf/main.js",
"pdf/metrics.js",
"pdf/open_pdf_params_parser.js",
"pdf/pdf_scripting_api.js",
"pdf/pdf_viewer_utils.js",
"pdf/pdf_viewer_base.js",
"pdf/toolbar_manager.js",
"pdf/viewport.js",
"pdf/viewport_scroller.js",
"pdf/zoom_manager.js",
]
}
preprocess_if_expr("preprocess_pdf_generated") {
......@@ -195,8 +212,14 @@ preprocess_if_expr("preprocess_pdf_generated") {
out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_pdf_gen_manifest"
in_files = [
"pdf/pdf_viewer_pp.js",
"pdf/elements/icons.js",
"pdf/elements/shared-vars.js",
"pdf/elements/viewer-error-screen.js",
"pdf/elements/viewer-page-indicator.js",
"pdf/elements/viewer-zoom-button.js",
"pdf/elements/viewer-zoom-toolbar.js",
"pdf/pdf_viewer_pp.js",
"pdf/pdf_viewer_shared_style.js",
]
}
......
......@@ -49,7 +49,6 @@
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/pdf_resources.h"
#include "chrome/grit/print_preview_resources.h"
#include "chrome/grit/print_preview_resources_map.h"
#include "chromeos/constants/chromeos_features.h"
......@@ -409,34 +408,6 @@ void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {
}
void SetupPrintPreviewPlugin(content::WebUIDataSource* source) {
static constexpr webui::ResourcePath kPdfResources[] = {
{"pdf/browser_api.js", IDR_PDF_BROWSER_API_JS},
{"pdf/constants.js", IDR_PDF_CONSTANTS_JS},
{"pdf/controller.js", IDR_PDF_CONTROLLER_JS},
{"pdf/elements/icons.js", IDR_PDF_ELEMENTS_ICONS_JS},
{"pdf/elements/shared-vars.js", IDR_PDF_ELEMENTS_SHARED_VARS_JS},
{"pdf/elements/viewer-error-screen.js",
IDR_PDF_ELEMENTS_VIEWER_ERROR_SCREEN_JS},
{"pdf/elements/viewer-zoom-button.js",
IDR_PDF_ELEMENTS_VIEWER_ZOOM_BUTTON_JS},
{"pdf/elements/viewer-zoom-toolbar.js",
IDR_PDF_ELEMENTS_VIEWER_ZOOM_TOOLBAR_JS},
{"pdf/gesture_detector.js", IDR_PDF_GESTURE_DETECTOR_JS},
{"pdf/index.css", IDR_PDF_INDEX_CSS},
{"pdf/main.js", IDR_PDF_MAIN_JS},
{"pdf/metrics.js", IDR_PDF_METRICS_JS},
{"pdf/open_pdf_params_parser.js", IDR_PDF_OPEN_PDF_PARAMS_PARSER_JS},
{"pdf/pdf_scripting_api.js", IDR_PDF_PDF_SCRIPTING_API_JS},
{"pdf/pdf_viewer_base.js", IDR_PDF_PDF_VIEWER_BASE_JS},
{"pdf/pdf_viewer_shared_style.js", IDR_PDF_PDF_VIEWER_SHARED_STYLE_JS},
{"pdf/pdf_viewer_utils.js", IDR_PDF_PDF_VIEWER_UTILS_JS},
{"pdf/toolbar_manager.js", IDR_PDF_TOOLBAR_MANAGER_JS},
{"pdf/viewport.js", IDR_PDF_VIEWPORT_JS},
{"pdf/viewport_scroller.js", IDR_PDF_VIEWPORT_SCROLLER_JS},
{"pdf/zoom_manager.js", IDR_PDF_ZOOM_MANAGER_JS},
};
webui::AddResourcePathsBulk(source, kPdfResources);
source->SetRequestFilter(base::BindRepeating(&ShouldHandleRequestCallback),
base::BindRepeating(&HandleRequestCallback));
source->OverrideContentSecurityPolicy(
......
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