OLD | NEW |
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 "content/browser/android/browser_startup_controller.h" | 5 #include "content/browser/android/browser_startup_controller.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 "content/browser/android/content_startup_flags.h" | 9 #include "content/browser/android/content_startup_flags.h" |
10 | 10 |
11 #include "jni/BrowserStartupController_jni.h" | 11 #include "jni/BrowserStartupController_jni.h" |
12 | 12 |
13 namespace content { | 13 namespace content { |
14 | 14 |
15 bool BrowserMayStartAsynchronously() { | 15 bool BrowserMayStartAsynchronously() { |
16 JNIEnv* env = base::android::AttachCurrentThread(); | 16 JNIEnv* env = base::android::AttachCurrentThread(); |
17 return Java_BrowserStartupController_browserMayStartAsynchonously(env); | 17 return Java_BrowserStartupController_browserMayStartAsynchonously(env); |
18 } | 18 } |
19 | 19 |
20 void BrowserStartupComplete(int result) { | 20 void BrowserStartupComplete(int result) { |
21 JNIEnv* env = base::android::AttachCurrentThread(); | 21 JNIEnv* env = base::android::AttachCurrentThread(); |
22 Java_BrowserStartupController_browserStartupComplete(env, result); | 22 Java_BrowserStartupController_browserStartupComplete(env, result); |
23 } | 23 } |
24 | 24 |
25 bool RegisterBrowserStartupController(JNIEnv* env) { | 25 bool RegisterBrowserStartupController(JNIEnv* env) { |
26 return RegisterNativesImpl(env); | 26 return RegisterNativesImpl(env); |
27 } | 27 } |
28 | 28 |
29 static void SetCommandLineFlags(JNIEnv* env, | 29 static void SetCommandLineFlags( |
30 jclass clazz, | 30 JNIEnv* env, |
31 jboolean single_process, | 31 const JavaParamRef<jclass>& clazz, |
32 jstring plugin_descriptor) { | 32 jboolean single_process, |
| 33 const JavaParamRef<jstring>& plugin_descriptor) { |
33 std::string plugin_str = | 34 std::string plugin_str = |
34 (plugin_descriptor == NULL | 35 (plugin_descriptor == NULL |
35 ? std::string() | 36 ? std::string() |
36 : base::android::ConvertJavaStringToUTF8(env, plugin_descriptor)); | 37 : base::android::ConvertJavaStringToUTF8(env, plugin_descriptor)); |
37 SetContentCommandLineFlags(static_cast<bool>(single_process), plugin_str); | 38 SetContentCommandLineFlags(static_cast<bool>(single_process), plugin_str); |
38 } | 39 } |
39 | 40 |
40 static jboolean IsOfficialBuild(JNIEnv* env, jclass clazz) { | 41 static jboolean IsOfficialBuild(JNIEnv* env, |
| 42 const JavaParamRef<jclass>& clazz) { |
41 #if defined(OFFICIAL_BUILD) | 43 #if defined(OFFICIAL_BUILD) |
42 return true; | 44 return true; |
43 #else | 45 #else |
44 return false; | 46 return false; |
45 #endif | 47 #endif |
46 } | 48 } |
47 | 49 |
48 static jboolean IsPluginEnabled(JNIEnv* env, jclass clazz) { | 50 static jboolean IsPluginEnabled(JNIEnv* env, |
| 51 const JavaParamRef<jclass>& clazz) { |
49 #if defined(ENABLE_PLUGINS) | 52 #if defined(ENABLE_PLUGINS) |
50 return true; | 53 return true; |
51 #else | 54 #else |
52 return false; | 55 return false; |
53 #endif | 56 #endif |
54 } | 57 } |
55 | 58 |
56 } // namespace content | 59 } // namespace content |
OLD | NEW |