| Index: blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc
|
| diff --git a/blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc b/blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc
|
| index fd200c03b4b1d11b463fc0a2707ab2cbfdc8a3cf..c8344563b5eed60696fb80816e85a9a1e077d747 100644
|
| --- a/blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc
|
| +++ b/blimp/client/core/contents/android/blimp_navigation_controller_impl_android.cc
|
| @@ -12,8 +12,6 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "jni/BlimpNavigationControllerImpl_jni.h"
|
|
|
| -using base::android::JavaParamRef;
|
| -
|
| namespace blimp {
|
| namespace client {
|
|
|
| @@ -72,31 +70,31 @@ BlimpNavigationControllerImplAndroid::GetTitle(JNIEnv* env, jobject jobj) {
|
|
|
| jboolean BlimpNavigationControllerImplAndroid::CanGoBack(
|
| JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| return blimp_navigation_controller_impl_->CanGoBack();
|
| }
|
|
|
| jboolean BlimpNavigationControllerImplAndroid::CanGoForward(
|
| JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| return blimp_navigation_controller_impl_->CanGoForward();
|
| }
|
|
|
| void BlimpNavigationControllerImplAndroid::GoBack(
|
| JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| blimp_navigation_controller_impl_->GoBack();
|
| }
|
|
|
| void BlimpNavigationControllerImplAndroid::GoForward(
|
| JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| blimp_navigation_controller_impl_->GoForward();
|
| }
|
|
|
| void BlimpNavigationControllerImplAndroid::Reload(
|
| JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| + const base::android::JavaParamRef<jobject>& obj) {
|
| blimp_navigation_controller_impl_->Reload();
|
| }
|
|
|
|
|