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 "chrome/common/chrome_features.h" |
15 #include "components/offline_pages/offline_page_feature.h" | 15 #include "components/offline_pages/offline_page_feature.h" |
| 16 #include "content/public/common/content_features.h" |
16 #include "jni/ChromeFeatureList_jni.h" | 17 #include "jni/ChromeFeatureList_jni.h" |
17 | 18 |
18 using base::android::ConvertJavaStringToUTF8; | 19 using base::android::ConvertJavaStringToUTF8; |
19 | 20 |
20 namespace chrome { | 21 namespace chrome { |
21 namespace android { | 22 namespace android { |
22 | 23 |
23 namespace { | 24 namespace { |
24 | 25 |
25 // Array of features exposed through the Java ChromeFeatureList API. Entries in | 26 // Array of features exposed through the Java ChromeFeatureList API. Entries in |
26 // this array may either refer to features defined in this file (above) or in | 27 // this array may either refer to features defined in this file (above) or in |
27 // other locations in the code base (e.g. chrome/, components/, etc). | 28 // other locations in the code base (e.g. chrome/, components/, etc). |
28 const base::Feature* kFeaturesExposedToJava[] = { | 29 const base::Feature* kFeaturesExposedToJava[] = { |
| 30 &features::kCredentialManagementAPI, |
| 31 &features::kSimplifiedFullscreenUI, |
29 &kMediaStyleNotification, | 32 &kMediaStyleNotification, |
| 33 &kNTPFakeOmniboxTextFeature, |
30 &kNTPOfflinePagesFeature, | 34 &kNTPOfflinePagesFeature, |
31 &kNTPSnippetsFeature, | 35 &kNTPSnippetsFeature, |
32 &kNTPToolbarFeature, | 36 &kNTPToolbarFeature, |
33 &kNTPFakeOmniboxTextFeature, | |
34 &kPhysicalWebFeature, | 37 &kPhysicalWebFeature, |
35 &features::kSimplifiedFullscreenUI, | |
36 &offline_pages::kOfflinePagesBackgroundLoadingFeature, | 38 &offline_pages::kOfflinePagesBackgroundLoadingFeature, |
37 }; | 39 }; |
38 | 40 |
39 } // namespace | 41 } // namespace |
40 | 42 |
41 const base::Feature kMediaStyleNotification { | 43 const base::Feature kMediaStyleNotification { |
42 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT | 44 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT |
43 }; | 45 }; |
44 | 46 |
45 const base::Feature kNTPOfflinePagesFeature { | 47 const base::Feature kNTPOfflinePagesFeature { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 NOTREACHED(); | 80 NOTREACHED(); |
79 return false; | 81 return false; |
80 } | 82 } |
81 | 83 |
82 bool RegisterChromeFeatureListJni(JNIEnv* env) { | 84 bool RegisterChromeFeatureListJni(JNIEnv* env) { |
83 return RegisterNativesImpl(env); | 85 return RegisterNativesImpl(env); |
84 } | 86 } |
85 | 87 |
86 } // namespace android | 88 } // namespace android |
87 } // namespace chrome | 89 } // namespace chrome |
OLD | NEW |