| 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 using base::android::JavaParamRef; |
| 14 |
| 13 namespace content { | 15 namespace content { |
| 14 | 16 |
| 15 bool BrowserMayStartAsynchronously() { | 17 bool BrowserMayStartAsynchronously() { |
| 16 JNIEnv* env = base::android::AttachCurrentThread(); | 18 JNIEnv* env = base::android::AttachCurrentThread(); |
| 17 return Java_BrowserStartupController_browserMayStartAsynchonously(env); | 19 return Java_BrowserStartupController_browserMayStartAsynchonously(env); |
| 18 } | 20 } |
| 19 | 21 |
| 20 void BrowserStartupComplete(int result) { | 22 void BrowserStartupComplete(int result) { |
| 21 JNIEnv* env = base::android::AttachCurrentThread(); | 23 JNIEnv* env = base::android::AttachCurrentThread(); |
| 22 Java_BrowserStartupController_browserStartupComplete(env, result); | 24 Java_BrowserStartupController_browserStartupComplete(env, result); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 static jboolean IsPluginEnabled(JNIEnv* env, | 58 static jboolean IsPluginEnabled(JNIEnv* env, |
| 57 const JavaParamRef<jclass>& clazz) { | 59 const JavaParamRef<jclass>& clazz) { |
| 58 #if defined(ENABLE_PLUGINS) | 60 #if defined(ENABLE_PLUGINS) |
| 59 return true; | 61 return true; |
| 60 #else | 62 #else |
| 61 return false; | 63 return false; |
| 62 #endif | 64 #endif |
| 63 } | 65 } |
| 64 | 66 |
| 65 } // namespace content | 67 } // namespace content |
| OLD | NEW |