summaryrefslogtreecommitdiffstats
path: root/components/web_contents_delegate_android
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 17:12:34 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 17:12:34 +0000
commit76b3d4c0c19e22601a51d310459ca639fee07c0f (patch)
tree52bea32f044c3b4fbbe06f1c88566471b1cb279f /components/web_contents_delegate_android
parentf06307e3bcb60750504e1203b498f9bdfdbd29f6 (diff)
downloadchromium_src-76b3d4c0c19e22601a51d310459ca639fee07c0f.zip
chromium_src-76b3d4c0c19e22601a51d310459ca639fee07c0f.tar.gz
chromium_src-76b3d4c0c19e22601a51d310459ca639fee07c0f.tar.bz2
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
Diffstat (limited to 'components/web_contents_delegate_android')
-rw-r--r--components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
index a7bb43a..ab134f5 100644
--- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
+++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java
@@ -1,4 +1,4 @@
-// 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
// found in the LICENSE file.
@@ -20,9 +20,9 @@ import org.chromium.ui.OnColorChangedListener;
@JNINamespace("web_contents_delegate_android")
public class ColorChooserAndroid {
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) {
OnColorChangedListener listener = new OnColorChangedListener() {
@Override
@@ -75,5 +75,5 @@ public class ColorChooserAndroid {
}
// Implemented in color_chooser_android.cc
- private native void nativeOnColorChosen(int nativeColorChooserAndroid, int color);
+ private native void nativeOnColorChosen(long nativeColorChooserAndroid, int color);
}