OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/android/chrome_feature_list.h" | 5 #include "chrome/browser/android/chrome_feature_list.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
12 #include "base/feature_list.h" | 12 #include "base/feature_list.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "chrome/common/chrome_features.h" |
14 #include "jni/ChromeFeatureList_jni.h" | 15 #include "jni/ChromeFeatureList_jni.h" |
15 | 16 |
16 using base::android::ConvertJavaStringToUTF8; | 17 using base::android::ConvertJavaStringToUTF8; |
17 | 18 |
18 namespace chrome { | 19 namespace chrome { |
19 namespace android { | 20 namespace android { |
20 | 21 |
21 namespace { | 22 namespace { |
22 | 23 |
23 // Array of features exposed through the Java ChromeFeatureList API. Entries in | 24 // Array of features exposed through the Java ChromeFeatureList API. Entries in |
24 // this array may either refer to features defined in this file (above) or in | 25 // this array may either refer to features defined in this file (above) or in |
25 // other locations in the code base (e.g. chrome/, components/, etc). | 26 // other locations in the code base (e.g. chrome/, components/, etc). |
26 const base::Feature* kFeaturesExposedToJava[] = { | 27 const base::Feature* kFeaturesExposedToJava[] = { |
27 &kNTPOfflinePagesFeature, | 28 &kNTPOfflinePagesFeature, |
28 &kPhysicalWebFeature, | 29 &kPhysicalWebFeature, |
| 30 &features::kSimplifiedFullscreenUI, |
29 }; | 31 }; |
30 | 32 |
31 } // namespace | 33 } // namespace |
32 | 34 |
33 const base::Feature kNTPOfflinePagesFeature { | 35 const base::Feature kNTPOfflinePagesFeature { |
34 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT | 36 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT |
35 }; | 37 }; |
36 | 38 |
37 const base::Feature kPhysicalWebFeature { | 39 const base::Feature kPhysicalWebFeature { |
38 "PhysicalWeb", base::FEATURE_DISABLED_BY_DEFAULT | 40 "PhysicalWeb", base::FEATURE_DISABLED_BY_DEFAULT |
(...skipping 11 matching lines...) Expand all Loading... |
50 NOTREACHED(); | 52 NOTREACHED(); |
51 return false; | 53 return false; |
52 } | 54 } |
53 | 55 |
54 bool RegisterChromeFeatureListJni(JNIEnv* env) { | 56 bool RegisterChromeFeatureListJni(JNIEnv* env) { |
55 return RegisterNativesImpl(env); | 57 return RegisterNativesImpl(env); |
56 } | 58 } |
57 | 59 |
58 } // namespace android | 60 } // namespace android |
59 } // namespace chrome | 61 } // namespace chrome |
OLD | NEW |