Skip to content

Commit

Permalink
JNI refactor: @NativeMethods conversion (//printing).
Browse files Browse the repository at this point in the history
This CL was generated by
//base/android/jni_generator/jni_refactorer.py.

Bug: 929661
Change-Id: Id6b2e31c1176244a50e718d0fd283ca2fe9403e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1809400
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Shimi Zhang <ctzsm@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697332}
  • Loading branch information
Eric Stevenson authored and Commit Bot committed Sep 17, 2019
1 parent 6d1f012 commit 160cebf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
2 changes: 2 additions & 0 deletions printing/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ if (is_android) {
android_library("printing_java") {
deps = [
"//base:base_java",
"//base:jni_java",
"//ui/android:ui_java",
]
java_files = [
Expand All @@ -393,5 +394,6 @@ if (is_android) {
"android/java/src/org/chromium/printing/PrintingController.java",
"android/java/src/org/chromium/printing/PrintingControllerImpl.java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.ui.base.WindowAndroid;

/**
Expand Down Expand Up @@ -106,8 +107,8 @@ public void askUserForSettings(final int maxPages) {
ThreadUtils.assertOnUiThread();
// If the printing dialog has already finished, tell Chromium that operation is cancelled.
if (mController.hasPrintingFinished()) {
// NOTE: We don't call nativeAskUserForSettingsReply (hence Chromium callback in
// AskUserForSettings callback) twice.
// NOTE: We don't call PrintingContextJni.get().askUserForSettingsReply (hence Chromium
// callback in AskUserForSettings callback) twice.
askUserForSettingsReply(false);
} else {
mController.setPrintingContext(this);
Expand All @@ -117,16 +118,19 @@ public void askUserForSettings(final int maxPages) {

private void askUserForSettingsReply(boolean success) {
assert mNativeObject != 0;
nativeAskUserForSettingsReply(mNativeObject, success);
PrintingContextJni.get().askUserForSettingsReply(
mNativeObject, PrintingContext.this, success);
}

private void showSystemDialogDone() {
assert mNativeObject != 0;
nativeShowSystemDialogDone(mNativeObject);
PrintingContextJni.get().showSystemDialogDone(mNativeObject, PrintingContext.this);
}

private native void nativeAskUserForSettingsReply(
long nativePrintingContextAndroid, boolean success);

private native void nativeShowSystemDialogDone(long nativePrintingContextAndroid);
@NativeMethods
interface Natives {
void askUserForSettingsReply(
long nativePrintingContextAndroid, PrintingContext caller, boolean success);
void showSystemDialogDone(long nativePrintingContextAndroid, PrintingContext caller);
}
}

0 comments on commit 160cebf

Please sign in to comment.