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

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

Issue 67573003: Android: moves chrome/ to use long for JNI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
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 18
19 #include "jni/ExternalPrerenderHandler_jni.h" 19 #include "jni/ExternalPrerenderHandler_jni.h"
20 20
21 using base::android::ConvertJavaStringToUTF16; 21 using base::android::ConvertJavaStringToUTF16;
22 22
23 namespace prerender { 23 namespace prerender {
24 24
25 bool ExternalPrerenderHandlerAndroid::AddPrerender(JNIEnv* env, 25 bool ExternalPrerenderHandlerAndroid::AddPrerender(JNIEnv* env,
26 jobject obj, 26 jobject obj,
27 jobject jprofile, 27 jobject jprofile,
28 jint web_contents_ptr, 28 jlong web_contents_ptr,
29 jstring jurl, 29 jstring jurl,
30 jstring jreferrer, 30 jstring jreferrer,
31 jint width, 31 jint width,
32 jint height) { 32 jint height) {
33 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile); 33 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
34 34
35 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl)); 35 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
36 if (!url.is_valid()) 36 if (!url.is_valid())
37 return false; 37 return false;
38 38
(...skipping 26 matching lines...) Expand all
65 if (!prerender_handle_) 65 if (!prerender_handle_)
66 return; 66 return;
67 prerender_handle_->OnCancel(); 67 prerender_handle_->OnCancel();
68 prerender_handle_.reset(); 68 prerender_handle_.reset();
69 } 69 }
70 70
71 static jboolean HasPrerenderedUrl(JNIEnv* env, 71 static jboolean HasPrerenderedUrl(JNIEnv* env,
72 jclass clazz, 72 jclass clazz,
73 jobject jprofile, 73 jobject jprofile,
74 jstring jurl, 74 jstring jurl,
75 jint web_contents_ptr) { 75 jlong web_contents_ptr) {
76 if (jurl == NULL) 76 if (jurl == NULL)
77 return false; 77 return false;
78 78
79 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile); 79 Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
80 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl)); 80 GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
81 if (!url.is_valid()) 81 if (!url.is_valid())
82 return false; 82 return false;
83 prerender::PrerenderManager* prerender_manager = 83 prerender::PrerenderManager* prerender_manager =
84 prerender::PrerenderManagerFactory::GetForProfile(profile); 84 prerender::PrerenderManagerFactory::GetForProfile(profile);
85 if (!prerender_manager) 85 if (!prerender_manager)
86 return false; 86 return false;
87 content::WebContents* web_contents = 87 content::WebContents* web_contents =
88 reinterpret_cast<content::WebContents*>(web_contents_ptr); 88 reinterpret_cast<content::WebContents*>(web_contents_ptr);
89 return prerender_manager->HasPrerenderedUrl(url, web_contents); 89 return prerender_manager->HasPrerenderedUrl(url, web_contents);
90 } 90 }
91 91
92 ExternalPrerenderHandlerAndroid::ExternalPrerenderHandlerAndroid() {} 92 ExternalPrerenderHandlerAndroid::ExternalPrerenderHandlerAndroid() {}
93 93
94 ExternalPrerenderHandlerAndroid::~ExternalPrerenderHandlerAndroid() {} 94 ExternalPrerenderHandlerAndroid::~ExternalPrerenderHandlerAndroid() {}
95 95
96 static jint Init(JNIEnv* env, jclass clazz) { 96 static jlong Init(JNIEnv* env, jclass clazz) {
97 ExternalPrerenderHandlerAndroid* external_handler = 97 ExternalPrerenderHandlerAndroid* external_handler =
98 new ExternalPrerenderHandlerAndroid(); 98 new ExternalPrerenderHandlerAndroid();
99 return reinterpret_cast<jint>(external_handler); 99 return reinterpret_cast<intptr_t>(external_handler);
100 } 100 }
101 101
102 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid( 102 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
103 JNIEnv* env) { 103 JNIEnv* env) {
104 return RegisterNativesImpl(env); 104 return RegisterNativesImpl(env);
105 } 105 }
106 106
107 } // namespace prerender 107 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/external_prerender_handler_android.h ('k') | chrome/browser/profiles/profile_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698