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

Unified Diff: printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java

Issue 1338333002: Add checks for android printing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated test. It still is kind of flaky (2/30, the print dialog comes up -> timeout), but no crash Created 5 years, 3 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 | « printing/android/java/src/org/chromium/printing/PrintingContext.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java
diff --git a/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java b/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java
index 3d8bbb057788ffe64357cdaf40fb46aa49b1d1e9..3900f5e680133b6ef61c63652a60f23f80c5d026 100644
--- a/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java
+++ b/printing/android/java/src/org/chromium/printing/PrintingControllerImpl.java
@@ -12,8 +12,8 @@
import android.print.PageRange;
import android.print.PrintAttributes;
import android.print.PrintDocumentInfo;
-import android.util.Log;
+import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.printing.PrintDocumentAdapterWrapper.PdfGenerator;
@@ -31,8 +31,7 @@
*/
@TargetApi(Build.VERSION_CODES.KITKAT)
public class PrintingControllerImpl implements PrintingController, PdfGenerator {
-
- private static final String LOG_TAG = "PrintingControllerImpl";
+ private static final String TAG = "cr.printing";
/**
* This is used for both initial state and a completed state (i.e. starting from either
@@ -181,7 +180,10 @@ public void setPrintingContext(final PrintingContextInterface printingContext) {
@Override
public void setPendingPrint(final Printable printable, PrintManagerDelegate printManager) {
- if (mIsBusy) return;
+ if (mIsBusy) {
+ Log.d(TAG, "Pending print can't be set. PrintingController is busy.");
+ return;
+ }
mPrintable = printable;
mPrintManager = printManager;
}
@@ -189,7 +191,9 @@ public void setPendingPrint(final Printable printable, PrintManagerDelegate prin
@Override
public void startPendingPrint(PrintingContextInterface printingContext) {
if (mIsBusy || mPrintManager == null) {
- Log.w(LOG_TAG, "Pending print can't be started. Is might be busy or not initialized.");
+ if (mIsBusy) Log.d(TAG, "Pending print can't be started. PrintingController is busy.");
+ else Log.d(TAG, "Pending print can't be started. No PrintManager provided.");
+
if (printingContext != null) printingContext.showSystemDialogDone();
return;
}
« no previous file with comments | « printing/android/java/src/org/chromium/printing/PrintingContext.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698