| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/android/testshell/testshell_tab.h" | 5 #include "chrome/android/testshell/testshell_tab.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" | 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
| 10 #include "chrome/browser/ui/android/window_android_helper.h" | 10 #include "chrome/browser/ui/android/window_android_helper.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 GURL fixed_url(URLFixerUpper::FixupURL(ConvertJavaStringToUTF8(env, url), | 88 GURL fixed_url(URLFixerUpper::FixupURL(ConvertJavaStringToUTF8(env, url), |
| 89 std::string())); | 89 std::string())); |
| 90 | 90 |
| 91 std::string fixed_spec; | 91 std::string fixed_spec; |
| 92 if (fixed_url.is_valid()) | 92 if (fixed_url.is_valid()) |
| 93 fixed_spec = fixed_url.spec(); | 93 fixed_spec = fixed_url.spec(); |
| 94 | 94 |
| 95 return ConvertUTF8ToJavaString(env, fixed_spec); | 95 return ConvertUTF8ToJavaString(env, fixed_spec); |
| 96 } | 96 } |
| 97 | 97 |
| 98 static jint Init(JNIEnv* env, jobject obj) { | 98 static jlong Init(JNIEnv* env, jobject obj) { |
| 99 return reinterpret_cast<jint>(new TestShellTab(env, obj)); | 99 return reinterpret_cast<intptr_t>(new TestShellTab(env, obj)); |
| 100 } | 100 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 67573003:
Android: moves chrome/ to use long for JNI (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src