| 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 StartGpuProcessOnBrowserStartup() { |
| 26 JNIEnv* env = base::android::AttachCurrentThread(); |
| 27 return Java_BrowserStartupController_startGpuProcessOnBrowserStartup(env); |
| 28 } |
| 29 |
| 25 bool RegisterBrowserStartupController(JNIEnv* env) { | 30 bool RegisterBrowserStartupController(JNIEnv* env) { |
| 26 return RegisterNativesImpl(env); | 31 return RegisterNativesImpl(env); |
| 27 } | 32 } |
| 28 | 33 |
| 29 static void SetCommandLineFlags( | 34 static void SetCommandLineFlags( |
| 30 JNIEnv* env, | 35 JNIEnv* env, |
| 31 const JavaParamRef<jclass>& clazz, | 36 const JavaParamRef<jclass>& clazz, |
| 32 jboolean single_process, | 37 jboolean single_process, |
| 33 const JavaParamRef<jstring>& plugin_descriptor) { | 38 const JavaParamRef<jstring>& plugin_descriptor) { |
| 34 std::string plugin_str = | 39 std::string plugin_str = |
| (...skipping 15 matching lines...) Expand all Loading... |
| 50 static jboolean IsPluginEnabled(JNIEnv* env, | 55 static jboolean IsPluginEnabled(JNIEnv* env, |
| 51 const JavaParamRef<jclass>& clazz) { | 56 const JavaParamRef<jclass>& clazz) { |
| 52 #if defined(ENABLE_PLUGINS) | 57 #if defined(ENABLE_PLUGINS) |
| 53 return true; | 58 return true; |
| 54 #else | 59 #else |
| 55 return false; | 60 return false; |
| 56 #endif | 61 #endif |
| 57 } | 62 } |
| 58 | 63 |
| 59 } // namespace content | 64 } // namespace content |
| OLD | NEW |