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

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

Issue 2259533003: Use bounds instead of size for prerender requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments nit Created 4 years, 4 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 50
51 } // namespace 51 } // namespace
52 52
53 bool ExternalPrerenderHandlerAndroid::AddPrerender( 53 bool ExternalPrerenderHandlerAndroid::AddPrerender(
54 JNIEnv* env, 54 JNIEnv* env,
55 const JavaParamRef<jobject>& obj, 55 const JavaParamRef<jobject>& obj,
56 const JavaParamRef<jobject>& jprofile, 56 const JavaParamRef<jobject>& jprofile,
57 const JavaParamRef<jobject>& jweb_contents, 57 const JavaParamRef<jobject>& jweb_contents,
58 const JavaParamRef<jstring>& jurl, 58 const JavaParamRef<jstring>& jurl,
59 const JavaParamRef<jstring>& jreferrer, 59 const JavaParamRef<jstring>& jreferrer,
60 jint width, 60 jint top,
61 jint height, 61 jint left,
62 jint bottom,
63 jint right,
62 jboolean prerender_on_cellular) { 64 jboolean prerender_on_cellular) {
63 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile); 65 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
64 66
65 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl)); 67 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
66 if (!url.is_valid()) 68 if (!url.is_valid())
67 return false; 69 return false;
68 70
69 content::Referrer referrer; 71 content::Referrer referrer;
70 if (!jreferrer.is_null()) { 72 if (!jreferrer.is_null()) {
71 GURL referrer_url(ConvertJavaStringToUTF16(env, jreferrer)); 73 GURL referrer_url(ConvertJavaStringToUTF16(env, jreferrer));
(...skipping 12 matching lines...) Expand all
84 content::WebContents::FromJavaWebContents(jweb_contents); 86 content::WebContents::FromJavaWebContents(jweb_contents);
85 if (prerender_handle_) 87 if (prerender_handle_)
86 prerender_handle_->OnNavigateAway(); 88 prerender_handle_->OnNavigateAway();
87 89
88 if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular( 90 if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular(
89 net::NetworkChangeNotifier::GetConnectionType())) { 91 net::NetworkChangeNotifier::GetConnectionType())) {
90 prerender_handle_ = 92 prerender_handle_ =
91 prerender_manager->AddPrerenderOnCellularFromExternalRequest( 93 prerender_manager->AddPrerenderOnCellularFromExternalRequest(
92 url, referrer, 94 url, referrer,
93 web_contents->GetController().GetDefaultSessionStorageNamespace(), 95 web_contents->GetController().GetDefaultSessionStorageNamespace(),
94 gfx::Size(width, height)); 96 gfx::Rect(top, left, bottom, right));
95 } else { 97 } else {
96 prerender_handle_ = prerender_manager->AddPrerenderFromExternalRequest( 98 prerender_handle_ = prerender_manager->AddPrerenderFromExternalRequest(
97 url, referrer, 99 url, referrer,
98 web_contents->GetController().GetDefaultSessionStorageNamespace(), 100 web_contents->GetController().GetDefaultSessionStorageNamespace(),
99 gfx::Size(width, height)); 101 gfx::Rect(top, left, bottom, right));
100 } 102 }
101 103
102 return !!prerender_handle_; 104 return !!prerender_handle_;
103 } 105 }
104 106
105 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender( 107 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender(
106 JNIEnv* env, 108 JNIEnv* env,
107 const JavaParamRef<jobject>& object) { 109 const JavaParamRef<jobject>& object) {
108 if (!prerender_handle_) 110 if (!prerender_handle_)
109 return; 111 return;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 new ExternalPrerenderHandlerAndroid(); 155 new ExternalPrerenderHandlerAndroid();
154 return reinterpret_cast<intptr_t>(external_handler); 156 return reinterpret_cast<intptr_t>(external_handler);
155 } 157 }
156 158
157 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( 159 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
158 JNIEnv* env) { 160 JNIEnv* env) {
159 return RegisterNativesImpl(env); 161 return RegisterNativesImpl(env);
160 } 162 }
161 163
162 } // namespace prerender 164 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/external_prerender_handler_android.h ('k') | chrome/browser/prerender/prerender_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698