Commit 76b3d4c0 authored by bulach@chromium.org's avatar bulach@chromium.org

Android: moves web_contents_delegate_android to use long for JNI.

BUG=317523

Review URL: https://codereview.chromium.org/131553002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243917 0039d316-1c4b-4281-b951-d872f2087c98
parent f06307e3
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
], ],
'variables': { 'variables': {
'jni_gen_package': 'web_contents_delegate_android', 'jni_gen_package': 'web_contents_delegate_android',
'jni_generator_ptr_type': 'long',
}, },
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
......
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -20,9 +20,9 @@ import org.chromium.ui.OnColorChangedListener; ...@@ -20,9 +20,9 @@ import org.chromium.ui.OnColorChangedListener;
@JNINamespace("web_contents_delegate_android") @JNINamespace("web_contents_delegate_android")
public class ColorChooserAndroid { public class ColorChooserAndroid {
private final ColorPickerDialog mDialog; private final ColorPickerDialog mDialog;
private final int mNativeColorChooserAndroid; private final long mNativeColorChooserAndroid;
private ColorChooserAndroid(int nativeColorChooserAndroid, private ColorChooserAndroid(long nativeColorChooserAndroid,
Context context, int initialColor, ColorSuggestion[] suggestions) { Context context, int initialColor, ColorSuggestion[] suggestions) {
OnColorChangedListener listener = new OnColorChangedListener() { OnColorChangedListener listener = new OnColorChangedListener() {
@Override @Override
...@@ -75,5 +75,5 @@ public class ColorChooserAndroid { ...@@ -75,5 +75,5 @@ public class ColorChooserAndroid {
} }
// Implemented in color_chooser_android.cc // Implemented in color_chooser_android.cc
private native void nativeOnColorChosen(int nativeColorChooserAndroid, int color); private native void nativeOnColorChosen(long nativeColorChooserAndroid, int color);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment