| OLD | NEW |
| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 content::WebContents::FromJavaWebContents(jweb_contents); | 86 content::WebContents::FromJavaWebContents(jweb_contents); |
| 87 if (prerender_handle_) | 87 if (prerender_handle_) |
| 88 prerender_handle_->OnNavigateAway(); | 88 prerender_handle_->OnNavigateAway(); |
| 89 | 89 |
| 90 if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular( | 90 if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular( |
| 91 net::NetworkChangeNotifier::GetConnectionType())) { | 91 net::NetworkChangeNotifier::GetConnectionType())) { |
| 92 prerender_handle_ = | 92 prerender_handle_ = |
| 93 prerender_manager->AddPrerenderOnCellularFromExternalRequest( | 93 prerender_manager->AddPrerenderOnCellularFromExternalRequest( |
| 94 url, referrer, | 94 url, referrer, |
| 95 web_contents->GetController().GetDefaultSessionStorageNamespace(), | 95 web_contents->GetController().GetDefaultSessionStorageNamespace(), |
| 96 gfx::Rect(top, left, bottom, right)); | 96 gfx::Rect(left, top, right - left, bottom - top)); |
| 97 } else { | 97 } else { |
| 98 prerender_handle_ = prerender_manager->AddPrerenderFromExternalRequest( | 98 prerender_handle_ = prerender_manager->AddPrerenderFromExternalRequest( |
| 99 url, referrer, | 99 url, referrer, |
| 100 web_contents->GetController().GetDefaultSessionStorageNamespace(), | 100 web_contents->GetController().GetDefaultSessionStorageNamespace(), |
| 101 gfx::Rect(top, left, bottom, right)); | 101 gfx::Rect(left, top, right - left, bottom - top)); |
| 102 } | 102 } |
| 103 | 103 |
| 104 return !!prerender_handle_; | 104 return !!prerender_handle_; |
| 105 } | 105 } |
| 106 | 106 |
| 107 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender( | 107 void ExternalPrerenderHandlerAndroid::CancelCurrentPrerender( |
| 108 JNIEnv* env, | 108 JNIEnv* env, |
| 109 const JavaParamRef<jobject>& object) { | 109 const JavaParamRef<jobject>& object) { |
| 110 if (!prerender_handle_) | 110 if (!prerender_handle_) |
| 111 return; | 111 return; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 new ExternalPrerenderHandlerAndroid(); | 155 new ExternalPrerenderHandlerAndroid(); |
| 156 return reinterpret_cast<intptr_t>(external_handler); | 156 return reinterpret_cast<intptr_t>(external_handler); |
| 157 } | 157 } |
| 158 | 158 |
| 159 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( | 159 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( |
| 160 JNIEnv* env) { | 160 JNIEnv* env) { |
| 161 return RegisterNativesImpl(env); | 161 return RegisterNativesImpl(env); |
| 162 } | 162 } |
| 163 | 163 |
| 164 } // namespace prerender | 164 } // namespace prerender |
| OLD | NEW |