Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: content/browser/android/browser_startup_controller.cc

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "ppapi/features/features.h"
10 11
11 #include "jni/BrowserStartupController_jni.h" 12 #include "jni/BrowserStartupController_jni.h"
12 13
13 using base::android::JavaParamRef; 14 using base::android::JavaParamRef;
14 15
15 namespace content { 16 namespace content {
16 17
17 bool BrowserMayStartAsynchronously() { 18 bool BrowserMayStartAsynchronously() {
18 JNIEnv* env = base::android::AttachCurrentThread(); 19 JNIEnv* env = base::android::AttachCurrentThread();
19 return Java_BrowserStartupController_browserMayStartAsynchonously(env); 20 return Java_BrowserStartupController_browserMayStartAsynchonously(env);
(...skipping 30 matching lines...) Expand all
50 const JavaParamRef<jclass>& clazz) { 51 const JavaParamRef<jclass>& clazz) {
51 #if defined(OFFICIAL_BUILD) 52 #if defined(OFFICIAL_BUILD)
52 return true; 53 return true;
53 #else 54 #else
54 return false; 55 return false;
55 #endif 56 #endif
56 } 57 }
57 58
58 static jboolean IsPluginEnabled(JNIEnv* env, 59 static jboolean IsPluginEnabled(JNIEnv* env,
59 const JavaParamRef<jclass>& clazz) { 60 const JavaParamRef<jclass>& clazz) {
60 #if defined(ENABLE_PLUGINS) 61 #if BUILDFLAG(ENABLE_PLUGINS)
61 return true; 62 return true;
62 #else 63 #else
63 return false; 64 return false;
64 #endif 65 #endif
65 } 66 }
66 67
67 } // namespace content 68 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698