| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/android/navigation_popup.h" | 5 #include "chrome/browser/ui/android/navigation_popup.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 env, | 79 env, |
| 80 obj.obj(), | 80 obj.obj(), |
| 81 jurl.obj(), | 81 jurl.obj(), |
| 82 gfx::ConvertToJavaBitmap(image.ToSkBitmap()).obj()); | 82 gfx::ConvertToJavaBitmap(image.ToSkBitmap()).obj()); |
| 83 } | 83 } |
| 84 | 84 |
| 85 static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) { | 85 static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) { |
| 86 return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release(); | 86 return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 static jint Init(JNIEnv* env, jobject obj) { | 89 static jlong Init(JNIEnv* env, jobject obj) { |
| 90 NavigationPopup* popup = new NavigationPopup(env, obj); | 90 NavigationPopup* popup = new NavigationPopup(env, obj); |
| 91 return reinterpret_cast<jint>(popup); | 91 return reinterpret_cast<intptr_t>(popup); |
| 92 } | 92 } |
| 93 | 93 |
| 94 // static | 94 // static |
| 95 bool NavigationPopup::RegisterNavigationPopup(JNIEnv* env) { | 95 bool NavigationPopup::RegisterNavigationPopup(JNIEnv* env) { |
| 96 return RegisterNativesImpl(env); | 96 return RegisterNativesImpl(env); |
| 97 } | 97 } |
| OLD | NEW |