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

Side by Side Diff: chrome/browser/prerender/external_prerender_handler_android.cc

Issue 1767243002: Update prerender policy for custom tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dan's comments Created 4 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/prerender/external_prerender_handler_android.h" 5 #include "chrome/browser/prerender/external_prerender_handler_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } // namespace 50 } // namespace
51 51
52 bool ExternalPrerenderHandlerAndroid::AddPrerender( 52 bool ExternalPrerenderHandlerAndroid::AddPrerender(
53 JNIEnv* env, 53 JNIEnv* env,
54 const JavaParamRef<jobject>& obj, 54 const JavaParamRef<jobject>& obj,
55 const JavaParamRef<jobject>& jprofile, 55 const JavaParamRef<jobject>& jprofile,
56 const JavaParamRef<jobject>& jweb_contents, 56 const JavaParamRef<jobject>& jweb_contents,
57 const JavaParamRef<jstring>& jurl, 57 const JavaParamRef<jstring>& jurl,
58 const JavaParamRef<jstring>& jreferrer, 58 const JavaParamRef<jstring>& jreferrer,
59 jint width, 59 jint width,
60 jint height) { 60 jint height,
61 bool prerender_on_mobile) {
Benoit L 2016/03/10 13:58:30 nit: jboolean.
Yusuf 2016/03/10 18:55:53 Done.
61 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile); 62 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
62 63
63 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl)); 64 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
64 if (!url.is_valid()) 65 if (!url.is_valid())
65 return false; 66 return false;
66 67
67 GURL referrer_url = GURL(ConvertJavaStringToUTF16(env, jreferrer)); 68 GURL referrer_url = GURL(ConvertJavaStringToUTF16(env, jreferrer));
68 content::Referrer referrer = referrer_url.is_valid() ? 69 content::Referrer referrer = referrer_url.is_valid() ?
69 content::Referrer(referrer_url, blink::WebReferrerPolicyDefault) : 70 content::Referrer(referrer_url, blink::WebReferrerPolicyDefault) :
70 content::Referrer(); 71 content::Referrer();
71 PrerenderManager* prerender_manager = 72 PrerenderManager* prerender_manager =
72 prerender::PrerenderManagerFactory::GetForProfile(profile); 73 prerender::PrerenderManagerFactory::GetForProfile(profile);
73 if (!prerender_manager) 74 if (!prerender_manager)
74 return false; 75 return false;
75 content::WebContents* web_contents = 76 content::WebContents* web_contents =
76 content::WebContents::FromJavaWebContents(jweb_contents); 77 content::WebContents::FromJavaWebContents(jweb_contents);
77 if (prerender_handle_.get()) { 78 if (prerender_handle_.get()) {
78 prerender_handle_->OnNavigateAway(); 79 prerender_handle_->OnNavigateAway();
79 } 80 }
80 prerender_handle_.reset( 81 prerender_handle_.reset(
81 prerender_manager->AddPrerenderFromExternalRequest( 82 prerender_manager->AddPrerenderFromExternalRequest(
82 url, 83 url,
83 referrer, 84 referrer,
84 web_contents->GetController().GetDefaultSessionStorageNamespace(), 85 web_contents->GetController().GetDefaultSessionStorageNamespace(),
85 gfx::Size(width, height))); 86 gfx::Size(width, height),
87 prerender_on_mobile));
86 if (!prerender_handle_) 88 if (!prerender_handle_)
87 return false; 89 return false;
88 return true; 90 return true;
89 } 91 }
90 92
91 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender( 93 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender(
92 JNIEnv* env, 94 JNIEnv* env,
93 const JavaParamRef<jobject>& object) { 95 const JavaParamRef<jobject>& object) {
94 if (!prerender_handle_) 96 if (!prerender_handle_)
95 return; 97 return;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 new ExternalPrerenderHandlerAndroid(); 138 new ExternalPrerenderHandlerAndroid();
137 return reinterpret_cast<intptr_t>(external_handler); 139 return reinterpret_cast<intptr_t>(external_handler);
138 } 140 }
139 141
140 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( 142 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
141 JNIEnv* env) { 143 JNIEnv* env) {
142 return RegisterNativesImpl(env); 144 return RegisterNativesImpl(env);
143 } 145 }
144 146
145 } // namespace prerender 147 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698