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" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
13 #include "content/shell/browser/shell.h" | 13 #include "content/shell/browser/shell.h" |
14 #include "content/shell/browser/shell_browser_context.h" | 14 #include "content/shell/browser/shell_browser_context.h" |
15 #include "content/shell/browser/shell_content_browser_client.h" | 15 #include "content/shell/browser/shell_content_browser_client.h" |
16 #include "jni/ShellManager_jni.h" | 16 #include "jni/ShellManager_jni.h" |
17 #include "url/gurl.h" | 17 #include "url/gurl.h" |
18 | 18 |
| 19 using base::android::JavaParamRef; |
19 using base::android::ScopedJavaLocalRef; | 20 using base::android::ScopedJavaLocalRef; |
20 | 21 |
21 namespace { | 22 namespace { |
22 | 23 |
23 struct GlobalState { | 24 struct GlobalState { |
24 GlobalState() {} | 25 GlobalState() {} |
25 base::android::ScopedJavaGlobalRef<jobject> j_shell_manager; | 26 base::android::ScopedJavaGlobalRef<jobject> j_shell_manager; |
26 }; | 27 }; |
27 | 28 |
28 base::LazyInstance<GlobalState> g_global_state = LAZY_INSTANCE_INITIALIZER; | 29 base::LazyInstance<GlobalState> g_global_state = LAZY_INSTANCE_INITIALIZER; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 ShellBrowserContext* browserContext = | 62 ShellBrowserContext* browserContext = |
62 ShellContentBrowserClient::Get()->browser_context(); | 63 ShellContentBrowserClient::Get()->browser_context(); |
63 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); | 64 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); |
64 Shell::CreateNewWindow(browserContext, | 65 Shell::CreateNewWindow(browserContext, |
65 url, | 66 url, |
66 NULL, | 67 NULL, |
67 gfx::Size()); | 68 gfx::Size()); |
68 } | 69 } |
69 | 70 |
70 } // namespace content | 71 } // namespace content |
OLD | NEW |