| 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 "content/shell/android/shell_manager.h" | 5 #include "content/shell/android/shell_manager.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/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 base::android::ScopedJavaLocalRef<jobject>(env, obj)); | 56 base::android::ScopedJavaLocalRef<jobject>(env, obj)); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void LaunchShell(JNIEnv* env, jclass clazz, jstring jurl) { | 59 void LaunchShell(JNIEnv* env, jclass clazz, jstring jurl) { |
| 60 ShellBrowserContext* browserContext = | 60 ShellBrowserContext* browserContext = |
| 61 ShellContentBrowserClient::Get()->browser_context(); | 61 ShellContentBrowserClient::Get()->browser_context(); |
| 62 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); | 62 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); |
| 63 Shell::CreateNewWindow(browserContext, | 63 Shell::CreateNewWindow(browserContext, |
| 64 url, | 64 url, |
| 65 NULL, | 65 NULL, |
| 66 MSG_ROUTING_NONE, | |
| 67 gfx::Size()); | 66 gfx::Size()); |
| 68 } | 67 } |
| 69 | 68 |
| 70 } // namespace content | 69 } // namespace content |
| OLD | NEW |