Chromium Code Reviews| Index: printing/printing_context_android.cc |
| diff --git a/printing/printing_context_android.cc b/printing/printing_context_android.cc |
| index 64139c8bfb837c708d0002bf4f85ff707a28e44e..b0b70a298228c66d158ffdca6ef39e5edafbe0b5 100644 |
| --- a/printing/printing_context_android.cc |
| +++ b/printing/printing_context_android.cc |
| @@ -82,6 +82,7 @@ PrintingContextAndroid::~PrintingContextAndroid() { |
| void PrintingContextAndroid::AskUserForSettings( |
| int max_pages, |
| bool has_selection, |
| + bool is_scripted, |
| const PrintSettingsCallback& callback) { |
| // This method is always run in the UI thread. |
| callback_ = callback; |
| @@ -93,9 +94,13 @@ void PrintingContextAndroid::AskUserForSettings( |
| reinterpret_cast<intptr_t>(this))); |
| } |
| - Java_PrintingContext_pageCountEstimationDone(env, |
| - j_printing_context_.obj(), |
| - max_pages); |
| + if (is_scripted) { |
| + Java_PrintingContext_showPrintDialog(env, j_printing_context_.obj()); |
| + } else { |
| + Java_PrintingContext_pageCountEstimationDone(env, |
| + j_printing_context_.obj(), |
| + max_pages); |
| + } |
| } |
| void PrintingContextAndroid::AskUserForSettingsReply(JNIEnv* env, |
| @@ -132,6 +137,12 @@ void PrintingContextAndroid::AskUserForSettingsReply(JNIEnv* env, |
| callback_.Run(OK); |
| } |
| +void PrintingContextAndroid::ShowSystemDialogDone(JNIEnv* env, |
| + jobject obj) { |
|
Bernhard Bauer
2014/12/15 09:38:02
Nit: Align
dgn
2014/12/15 10:27:06
Done.
|
| + // Settings are not updated, callback is called only to unblock javascript. |
| + callback_.Run(CANCEL); |
| +} |
| + |
| PrintingContext::Result PrintingContextAndroid::UseDefaultSettings() { |
| DCHECK(!in_print_job_); |