Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: content/browser/frame_host/render_frame_host_android.cc

Issue 2765443004: AndroidOverlay implementation using Dialog. (Closed)
Patch Set: cl feedback, fixed browsertests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/android/unguessable_token_android.h"
8 #include "base/logging.h" 9 #include "base/logging.h"
9 #include "content/browser/frame_host/render_frame_host_delegate.h" 10 #include "content/browser/frame_host/render_frame_host_delegate.h"
10 #include "content/browser/frame_host/render_frame_host_impl.h" 11 #include "content/browser/frame_host/render_frame_host_impl.h"
11 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/site_instance.h" 13 #include "content/public/browser/site_instance.h"
13 #include "jni/RenderFrameHostImpl_jni.h" 14 #include "jni/RenderFrameHostImpl_jni.h"
14 15
15 using base::android::AttachCurrentThread; 16 using base::android::AttachCurrentThread;
16 using base::android::ConvertUTF8ToJavaString; 17 using base::android::ConvertUTF8ToJavaString;
17 using base::android::JavaParamRef; 18 using base::android::JavaParamRef;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 return obj_.get(env); 55 return obj_.get(env);
55 } 56 }
56 57
57 ScopedJavaLocalRef<jstring> RenderFrameHostAndroid::GetLastCommittedURL( 58 ScopedJavaLocalRef<jstring> RenderFrameHostAndroid::GetLastCommittedURL(
58 JNIEnv* env, 59 JNIEnv* env,
59 const JavaParamRef<jobject>& obj) const { 60 const JavaParamRef<jobject>& obj) const {
60 return ConvertUTF8ToJavaString( 61 return ConvertUTF8ToJavaString(
61 env, render_frame_host_->GetLastCommittedURL().spec()); 62 env, render_frame_host_->GetLastCommittedURL().spec());
62 } 63 }
63 64
65 ScopedJavaLocalRef<jobject>
66 RenderFrameHostAndroid::GetAndroidOverlayRoutingToken(
67 JNIEnv* env,
68 const JavaParamRef<jobject>& obj) const {
69 return base::android::UnguessableTokenAndroid::Create(
70 env, render_frame_host_->GetOverlayRoutingToken());
71 }
72
64 } // namespace content 73 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698