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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_ui.cc

Issue 23054002: Added basic browser test for window.print() from Chrome apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary code that was breaking builds Created 7 years, 4 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
Index: chrome/browser/ui/webui/print_preview/print_preview_ui.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index ca4c7e43595e953969fe7512ee9086d07136a4f2..4e8e8abcd79cf28ae2403723f3c12de54919c4f3 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -520,8 +520,12 @@ void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count,
}
base::FundamentalValue ui_identifier(id_);
base::FundamentalValue ui_preview_request_id(preview_request_id);
- web_ui()->CallJavascriptFunction("updatePrintPreview", ui_identifier,
- ui_preview_request_id);
+ if (AutoCancelForTesting()) {
+ OnClosePrintPreviewDialog();
+ } else {
+ web_ui()->CallJavascriptFunction("updatePrintPreview", ui_identifier,
+ ui_preview_request_id);
+ }
}
void PrintPreviewUI::OnPrintPreviewDialogDestroyed() {
@@ -582,3 +586,13 @@ void PrintPreviewUI::OnReloadPrintersList() {
void PrintPreviewUI::OnPrintPreviewScalingDisabled() {
web_ui()->CallJavascriptFunction("printScalingDisabledForSourcePDF");
}
+
+static bool g_auto_cancel_for_testing_ = false;
+
+void PrintPreviewUI::SetAutoCancelForTesting(bool auto_cancel) {
+ g_auto_cancel_for_testing_ = auto_cancel;
+}
+
+bool PrintPreviewUI::AutoCancelForTesting() {
+ return g_auto_cancel_for_testing_;
+}

Powered by Google App Engine
This is Rietveld 408576698