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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 return RegisterNativesImpl(env); | 43 return RegisterNativesImpl(env); |
44 } | 44 } |
45 | 45 |
46 static void Init(JNIEnv* env, jclass clazz, jobject obj) { | 46 static void Init(JNIEnv* env, jclass clazz, jobject obj) { |
47 g_global_state.Get().j_shell_manager.Reset( | 47 g_global_state.Get().j_shell_manager.Reset( |
48 base::android::ScopedJavaLocalRef<jobject>(env, obj)); | 48 base::android::ScopedJavaLocalRef<jobject>(env, obj)); |
49 } | 49 } |
50 | 50 |
51 void LaunchShell(JNIEnv* env, jclass clazz, jstring jurl) { | 51 void LaunchShell(JNIEnv* env, jclass clazz, jstring jurl) { |
52 ShellBrowserContext* browserContext = | 52 ShellBrowserContext* browserContext = |
53 static_cast<ShellContentBrowserClient*>( | 53 ShellContentBrowserClient::Get()->browser_context(); |
54 GetContentClient()->browser())->browser_context(); | |
55 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); | 54 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); |
56 Shell::CreateNewWindow(browserContext, | 55 Shell::CreateNewWindow(browserContext, |
57 url, | 56 url, |
58 NULL, | 57 NULL, |
59 MSG_ROUTING_NONE, | 58 MSG_ROUTING_NONE, |
60 gfx::Size()); | 59 gfx::Size()); |
61 } | 60 } |
62 | 61 |
63 } // namespace content | 62 } // namespace content |
OLD | NEW |