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 |
(...skipping 14 matching lines...) Expand all Loading... |
25 | 25 |
26 // Array of features exposed through the Java ChromeFeatureList API. Entries in | 26 // Array of features exposed through the Java ChromeFeatureList API. Entries in |
27 // 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 |
28 // other locations in the code base (e.g. chrome/, components/, etc). | 28 // other locations in the code base (e.g. chrome/, components/, etc). |
29 const base::Feature* kFeaturesExposedToJava[] = { | 29 const base::Feature* kFeaturesExposedToJava[] = { |
30 &features::kCredentialManagementAPI, | 30 &features::kCredentialManagementAPI, |
31 &features::kSimplifiedFullscreenUI, | 31 &features::kSimplifiedFullscreenUI, |
32 &kImportantSitesInCBD, | 32 &kImportantSitesInCBD, |
33 &kMediaStyleNotification, | 33 &kMediaStyleNotification, |
34 &kNTPFakeOmniboxTextFeature, | 34 &kNTPFakeOmniboxTextFeature, |
| 35 &kNTPMaterialDesign, |
35 &kNTPOfflinePagesFeature, | 36 &kNTPOfflinePagesFeature, |
36 &kNTPSnippetsFeature, | 37 &kNTPSnippetsFeature, |
37 &kNTPToolbarFeature, | 38 &kNTPToolbarFeature, |
38 &kPhysicalWebFeature, | 39 &kPhysicalWebFeature, |
39 &offline_pages::kOfflinePagesBackgroundLoadingFeature, | 40 &offline_pages::kOfflinePagesBackgroundLoadingFeature, |
40 }; | 41 }; |
41 | 42 |
42 } // namespace | 43 } // namespace |
43 | 44 |
44 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", | 45 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", |
45 base::FEATURE_DISABLED_BY_DEFAULT}; | 46 base::FEATURE_DISABLED_BY_DEFAULT}; |
46 | 47 |
47 const base::Feature kMediaStyleNotification { | 48 const base::Feature kMediaStyleNotification { |
48 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT | 49 "MediaStyleNotification", base::FEATURE_DISABLED_BY_DEFAULT |
49 }; | 50 }; |
50 | 51 |
| 52 const base::Feature kNTPMaterialDesign{"NTPMaterialDesign", |
| 53 base::FEATURE_ENABLED_BY_DEFAULT}; |
| 54 |
51 const base::Feature kNTPOfflinePagesFeature { | 55 const base::Feature kNTPOfflinePagesFeature { |
52 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT | 56 "NTPOfflinePages", base::FEATURE_DISABLED_BY_DEFAULT |
53 }; | 57 }; |
54 | 58 |
55 const base::Feature kNTPSnippetsFeature { | 59 const base::Feature kNTPSnippetsFeature { |
56 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT | 60 "NTPSnippets", base::FEATURE_DISABLED_BY_DEFAULT |
57 }; | 61 }; |
58 | 62 |
59 const base::Feature kNTPToolbarFeature { | 63 const base::Feature kNTPToolbarFeature { |
60 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT | 64 "NTPToolbar", base::FEATURE_ENABLED_BY_DEFAULT |
(...skipping 23 matching lines...) Expand all Loading... |
84 NOTREACHED(); | 88 NOTREACHED(); |
85 return false; | 89 return false; |
86 } | 90 } |
87 | 91 |
88 bool RegisterChromeFeatureListJni(JNIEnv* env) { | 92 bool RegisterChromeFeatureListJni(JNIEnv* env) { |
89 return RegisterNativesImpl(env); | 93 return RegisterNativesImpl(env); |
90 } | 94 } |
91 | 95 |
92 } // namespace android | 96 } // namespace android |
93 } // namespace chrome | 97 } // namespace chrome |
OLD | NEW |