summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/resources/print_preview/print_preview.js5
-rw-r--r--chrome/test/data/webui/print_preview.js7
2 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index baa6658..e1928c9a 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -819,6 +819,10 @@ function onPDFLoad() {
if (previewModifiable) {
setPluginPreviewPageCount();
}
+ // Instruct the plugin which page numbers to display in the page number
+ // indicator.
+ previewArea.pdfPlugin.setPageNumbers(
+ JSON.stringify(pageSettings.selectedPagesSet));
cr.dispatchSimpleEvent(document, customEvents.PDF_LOADED);
isFirstPageLoaded = true;
checkAndHideOverlayLayerIfValid();
@@ -1037,6 +1041,7 @@ function checkCompatiblePluginExists() {
dummyPlugin.pageXOffset,
dummyPlugin.pageYOffset,
dummyPlugin.setZoomLevel,
+ dummyPlugin.setPageNumbers,
dummyPlugin.setPageXOffset,
dummyPlugin.setPageYOffset,
dummyPlugin.getHorizontalScrollbarThickness,
diff --git a/chrome/test/data/webui/print_preview.js b/chrome/test/data/webui/print_preview.js
index ef27763..cf016a0 100644
--- a/chrome/test/data/webui/print_preview.js
+++ b/chrome/test/data/webui/print_preview.js
@@ -94,8 +94,9 @@ PrintPreviewWebUITest.prototype = {
// Initializing |previewArea| object here because we need to replace a
// method.
- previewArea = print_preview.PreviewArea.getInstance();
- this.previewArea.createOrReloadPDFPlugin = self.createOrReloadPDFPlugin;
+ this.previewArea = print_preview.PreviewArea.getInstance();
+ this.previewArea.createOrReloadPDFPlugin =
+ self.createOrReloadPDFPlugin.bind(previewArea);
}
this.checkCompatiblePluginExists =
@@ -145,6 +146,7 @@ PrintPreviewWebUITest.prototype = {
pdfViewer.setZoomLevel = fakeFunction;
pdfViewer.pageXOffset = fakeFunction;
pdfViewer.pageYOffset = fakeFunction;
+ pdfViewer.setPageNumbers = fakeFunction;
pdfViewer.setPageXOffset = fakeFunction;
pdfViewer.setPageYOffset = fakeFunction;
pdfViewer.getHeight = fakeFunction;
@@ -155,6 +157,7 @@ PrintPreviewWebUITest.prototype = {
pdfViewer.getHorizontalScrollbarThickness = fakeFunction;
pdfViewer.getVerticalScrollbarThickness = fakeFunction;
$('mainview').appendChild(pdfViewer);
+ this.pdfPlugin_ = pdfViewer;
onPDFLoad();
},