Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3509)

Unified Diff: chrome/browser/resources/print_preview/previewarea/preview_area.js

Issue 2741483002: Check for RPCS printers and return error if Win8+ (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | printing/backend/win_helper.cc » ('j') | printing/backend/win_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview/previewarea/preview_area.js
diff --git a/chrome/browser/resources/print_preview/previewarea/preview_area.js b/chrome/browser/resources/print_preview/previewarea/preview_area.js
index ca553a7c7a1102a1c5cf4aee36ab9b713ccaa22f..ec5fde1e8c73a31b4ad72702c9c779227c8a88af 100644
--- a/chrome/browser/resources/print_preview/previewarea/preview_area.js
+++ b/chrome/browser/resources/print_preview/previewarea/preview_area.js
@@ -306,6 +306,14 @@ cr.define('print_preview', function() {
*/
showCustomMessage: function(message) {
this.showMessage_(PreviewArea.MessageId_.CUSTOM, message);
+ if (message == loadTimeData.getString('invalidPrinterSettings') &&
Lei Zhang 2017/03/08 20:27:22 Is there ever a case where we want to show a messa
rbpotter 2017/03/08 23:25:25 Probably not. This shouldn't occur for the other 2
+ this.loadingTimeout_) {
+ // Stop trying to generate the preview so that "preview loading..."
+ // does not overwrite the error message. Should not preview for an
+ // invalid printer.
+ clearTimeout(this.loadingTimeout_);
+ this.loadingTimeout_ = null;
+ }
},
/** @override */
« no previous file with comments | « no previous file | printing/backend/win_helper.cc » ('j') | printing/backend/win_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698