summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/android/navigation_popup.cc
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 20:39:10 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 20:39:10 +0000
commit8c3ce8d82d114a8f1f18be61ff6494faa6d29507 (patch)
tree5a3cfbc0c57a0069f30e9f77d4266c2284ed997a /chrome/browser/ui/android/navigation_popup.cc
parente5bcc76bb050fa903fe93c50e3534fb2d7a6a65f (diff)
downloadchromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.zip
chromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.tar.gz
chromium_src-8c3ce8d82d114a8f1f18be61ff6494faa6d29507.tar.bz2
Android: moves chrome/ to use long for JNI
BUG=317523 Review URL: https://codereview.chromium.org/67573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/android/navigation_popup.cc')
-rw-r--r--chrome/browser/ui/android/navigation_popup.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc
index fca009d..dd9dffd 100644
--- a/chrome/browser/ui/android/navigation_popup.cc
+++ b/chrome/browser/ui/android/navigation_popup.cc
@@ -86,9 +86,9 @@ static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) {
return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release();
}
-static jint Init(JNIEnv* env, jobject obj) {
+static jlong Init(JNIEnv* env, jobject obj) {
NavigationPopup* popup = new NavigationPopup(env, obj);
- return reinterpret_cast<jint>(popup);
+ return reinterpret_cast<intptr_t>(popup);
}
// static