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

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: mmenke@'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"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/prerender/prerender_handle.h" 12 #include "chrome/browser/prerender/prerender_handle.h"
13 #include "chrome/browser/prerender/prerender_manager.h" 13 #include "chrome/browser/prerender/prerender_manager.h"
14 #include "chrome/browser/prerender/prerender_manager_factory.h" 14 #include "chrome/browser/prerender/prerender_manager_factory.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/profiles/profile_android.h" 16 #include "chrome/browser/profiles/profile_android.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18
19 #include "jni/ExternalPrerenderHandler_jni.h" 18 #include "jni/ExternalPrerenderHandler_jni.h"
19 #include "net/base/network_change_notifier.h"
20 20
21 using base::android::ConvertJavaStringToUTF16; 21 using base::android::ConvertJavaStringToUTF16;
22 22
23 namespace prerender { 23 namespace prerender {
24 24
25 namespace { 25 namespace {
26 26
27 static bool CheckAndConvertParams( 27 static bool CheckAndConvertParams(
28 JNIEnv* env, 28 JNIEnv* env,
29 const JavaParamRef<jobject>& jprofile, 29 const JavaParamRef<jobject>& jprofile,
(...skipping 20 matching lines...) Expand all
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 jboolean prerender_on_cellular) {
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 if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular(
81 prerender_manager->AddPrerenderFromExternalRequest( 82 net::NetworkChangeNotifier::GetConnectionType())) {
82 url, 83 prerender_handle_.reset(
83 referrer, 84 prerender_manager->AddPrerenderOnCellularFromExternalRequest(
84 web_contents->GetController().GetDefaultSessionStorageNamespace(), 85 url,
85 gfx::Size(width, height))); 86 referrer,
87 web_contents->GetController().GetDefaultSessionStorageNamespace(),
88 gfx::Size(width, height)));
89 } else {
90 prerender_handle_.reset(
91 prerender_manager->AddPrerenderFromExternalRequest(
92 url,
93 referrer,
94 web_contents->GetController().GetDefaultSessionStorageNamespace(),
95 gfx::Size(width, height)));
96 }
97
86 if (!prerender_handle_) 98 if (!prerender_handle_)
87 return false; 99 return false;
88 return true; 100 return true;
89 } 101 }
90 102
91 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender( 103 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender(
92 JNIEnv* env, 104 JNIEnv* env,
93 const JavaParamRef<jobject>& object) { 105 const JavaParamRef<jobject>& object) {
94 if (!prerender_handle_) 106 if (!prerender_handle_)
95 return; 107 return;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 new ExternalPrerenderHandlerAndroid(); 148 new ExternalPrerenderHandlerAndroid();
137 return reinterpret_cast<intptr_t>(external_handler); 149 return reinterpret_cast<intptr_t>(external_handler);
138 } 150 }
139 151
140 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( 152 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
141 JNIEnv* env) { 153 JNIEnv* env) {
142 return RegisterNativesImpl(env); 154 return RegisterNativesImpl(env);
143 } 155 }
144 156
145 } // namespace prerender 157 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/external_prerender_handler_android.h ('k') | chrome/browser/prerender/prerender_histograms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698