Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "content/browser/frame_host/render_frame_host_android.h" | 5 #include "content/browser/frame_host/render_frame_host_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "content/browser/frame_host/render_frame_host_delegate.h" | 9 #include "content/browser/frame_host/render_frame_host_delegate.h" |
| 10 #include "content/browser/frame_host/render_frame_host_impl.h" | 10 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 11 #include "content/public/browser/browser_context.h" | |
| 12 #include "content/public/browser/site_instance.h" | |
| 11 #include "jni/RenderFrameHostImpl_jni.h" | 13 #include "jni/RenderFrameHostImpl_jni.h" |
| 12 | 14 |
| 13 using base::android::AttachCurrentThread; | 15 using base::android::AttachCurrentThread; |
| 14 using base::android::ConvertUTF8ToJavaString; | 16 using base::android::ConvertUTF8ToJavaString; |
| 15 using base::android::JavaParamRef; | 17 using base::android::JavaParamRef; |
| 16 using base::android::JavaRef; | 18 using base::android::JavaRef; |
| 17 using base::android::ScopedJavaLocalRef; | 19 using base::android::ScopedJavaLocalRef; |
| 18 | 20 |
| 19 namespace content { | 21 namespace content { |
| 20 | 22 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 32 if (!jobj.is_null()) { | 34 if (!jobj.is_null()) { |
| 33 Java_RenderFrameHostImpl_clearNativePtr(AttachCurrentThread(), jobj); | 35 Java_RenderFrameHostImpl_clearNativePtr(AttachCurrentThread(), jobj); |
| 34 obj_.reset(); | 36 obj_.reset(); |
| 35 } | 37 } |
| 36 } | 38 } |
| 37 | 39 |
| 38 base::android::ScopedJavaLocalRef<jobject> | 40 base::android::ScopedJavaLocalRef<jobject> |
| 39 RenderFrameHostAndroid::GetJavaObject() { | 41 RenderFrameHostAndroid::GetJavaObject() { |
| 40 JNIEnv* env = base::android::AttachCurrentThread(); | 42 JNIEnv* env = base::android::AttachCurrentThread(); |
| 41 if (obj_.is_uninitialized()) { | 43 if (obj_.is_uninitialized()) { |
| 44 bool isIncognito = render_frame_host_->GetSiteInstance() | |
|
Matt Giuca
2017/03/24 05:06:55
Naming: is_incognito
Timothy Loh
2017/03/27 02:06:23
Done.
| |
| 45 ->GetBrowserContext() | |
| 46 ->IsOffTheRecord(); | |
| 42 ScopedJavaLocalRef<jobject> local_ref = Java_RenderFrameHostImpl_create( | 47 ScopedJavaLocalRef<jobject> local_ref = Java_RenderFrameHostImpl_create( |
| 43 env, reinterpret_cast<intptr_t>(this), | 48 env, reinterpret_cast<intptr_t>(this), |
| 44 render_frame_host_->delegate()->GetJavaRenderFrameHostDelegate()); | 49 render_frame_host_->delegate()->GetJavaRenderFrameHostDelegate(), |
| 50 isIncognito); | |
| 45 obj_ = JavaObjectWeakGlobalRef(env, local_ref); | 51 obj_ = JavaObjectWeakGlobalRef(env, local_ref); |
| 46 return local_ref; | 52 return local_ref; |
| 47 } | 53 } |
| 48 return obj_.get(env); | 54 return obj_.get(env); |
| 49 } | 55 } |
| 50 | 56 |
| 51 ScopedJavaLocalRef<jstring> RenderFrameHostAndroid::GetLastCommittedURL( | 57 ScopedJavaLocalRef<jstring> RenderFrameHostAndroid::GetLastCommittedURL( |
| 52 JNIEnv* env, | 58 JNIEnv* env, |
| 53 const JavaParamRef<jobject>& obj) const { | 59 const JavaParamRef<jobject>& obj) const { |
| 54 return ConvertUTF8ToJavaString( | 60 return ConvertUTF8ToJavaString( |
| 55 env, render_frame_host_->GetLastCommittedURL().spec()); | 61 env, render_frame_host_->GetLastCommittedURL().spec()); |
| 56 } | 62 } |
| 57 | 63 |
| 58 } // namespace content | 64 } // namespace content |
| OLD | NEW |