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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
44 &features::kWebPayments, | 44 &features::kWebPayments, |
45 &kAndroidPayIntegrationV1, | 45 &kAndroidPayIntegrationV1, |
46 &kAndroidPayIntegrationV2, | 46 &kAndroidPayIntegrationV2, |
47 &kAndroidPaymentApps, | 47 &kAndroidPaymentApps, |
48 &kAndroidPaymentAppsFilter, | 48 &kAndroidPaymentAppsFilter, |
49 &kCCTExternalLinkHandling, | 49 &kCCTExternalLinkHandling, |
50 &kCCTPostMessageAPI, | 50 &kCCTPostMessageAPI, |
51 &kChromeHomeFeature, | 51 &kChromeHomeFeature, |
52 &kContextualSearchSingleActions, | 52 &kContextualSearchSingleActions, |
53 &kContextualSearchUrlActions, | 53 &kContextualSearchUrlActions, |
54 &kCustomContextMenu, | |
54 &kCustomFeedbackUi, | 55 &kCustomFeedbackUi, |
55 &kImportantSitesInCBD, | 56 &kImportantSitesInCBD, |
56 &kImprovedA2HS, | 57 &kImprovedA2HS, |
57 &kNewPhotoPicker, | 58 &kNewPhotoPicker, |
58 &kNoCreditCardAbort, | 59 &kNoCreditCardAbort, |
59 &kNTPCondensedLayoutFeature, | 60 &kNTPCondensedLayoutFeature, |
60 &kNTPCondensedTileLayoutFeature, | 61 &kNTPCondensedTileLayoutFeature, |
61 &kNTPFakeOmniboxTextFeature, | 62 &kNTPFakeOmniboxTextFeature, |
62 &kNTPLaunchAfterInactivity, | 63 &kNTPLaunchAfterInactivity, |
63 &kNTPOfflinePagesFeature, | 64 &kNTPOfflinePagesFeature, |
(...skipping 16 matching lines...) Expand all Loading... | |
80 &offline_pages::kOfflinePagesCTFeature, // See crbug.com/620421. | 81 &offline_pages::kOfflinePagesCTFeature, // See crbug.com/620421. |
81 &offline_pages::kOfflinePagesSharingFeature, | 82 &offline_pages::kOfflinePagesSharingFeature, |
82 &password_manager::features::kViewPasswords, | 83 &password_manager::features::kViewPasswords, |
83 }; | 84 }; |
84 | 85 |
85 const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { | 86 const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { |
86 for (size_t i = 0; i < arraysize(kFeaturesExposedToJava); ++i) { | 87 for (size_t i = 0; i < arraysize(kFeaturesExposedToJava); ++i) { |
87 if (kFeaturesExposedToJava[i]->name == feature_name) | 88 if (kFeaturesExposedToJava[i]->name == feature_name) |
88 return kFeaturesExposedToJava[i]; | 89 return kFeaturesExposedToJava[i]; |
89 } | 90 } |
90 NOTREACHED() << "Queried feature cannot be found in ChromeFeatureList: " | 91 NOTREACHED() << "Features queried via ChromeFeatureList must be present in " |
JJ
2017/03/17 21:12:43
Absolutely unintentional, fixed in next patch.
| |
91 << feature_name; | 92 "|kFeaturesExposedToJava|."; |
92 return nullptr; | 93 return nullptr; |
93 } | 94 } |
94 | 95 |
95 } // namespace | 96 } // namespace |
96 | 97 |
97 // Alphabetical: | 98 // Alphabetical: |
98 const base::Feature kAndroidPayIntegrationV1{"AndroidPayIntegrationV1", | 99 const base::Feature kAndroidPayIntegrationV1{"AndroidPayIntegrationV1", |
99 base::FEATURE_ENABLED_BY_DEFAULT}; | 100 base::FEATURE_ENABLED_BY_DEFAULT}; |
100 | 101 |
101 const base::Feature kAndroidPayIntegrationV2{"AndroidPayIntegrationV2", | 102 const base::Feature kAndroidPayIntegrationV2{"AndroidPayIntegrationV2", |
(...skipping 13 matching lines...) Expand all Loading... | |
115 | 116 |
116 const base::Feature kChromeHomeFeature{"ChromeHome", | 117 const base::Feature kChromeHomeFeature{"ChromeHome", |
117 base::FEATURE_DISABLED_BY_DEFAULT}; | 118 base::FEATURE_DISABLED_BY_DEFAULT}; |
118 | 119 |
119 const base::Feature kContextualSearchSingleActions{ | 120 const base::Feature kContextualSearchSingleActions{ |
120 "ContextualSearchSingleActions", base::FEATURE_ENABLED_BY_DEFAULT}; | 121 "ContextualSearchSingleActions", base::FEATURE_ENABLED_BY_DEFAULT}; |
121 | 122 |
122 const base::Feature kContextualSearchUrlActions{ | 123 const base::Feature kContextualSearchUrlActions{ |
123 "ContextualSearchUrlActions", base::FEATURE_DISABLED_BY_DEFAULT}; | 124 "ContextualSearchUrlActions", base::FEATURE_DISABLED_BY_DEFAULT}; |
124 | 125 |
126 const base::Feature kCustomContextMenu{"CustomContextMenu", | |
127 base::FEATURE_DISABLED_BY_DEFAULT}; | |
128 | |
125 const base::Feature kCustomFeedbackUi{"CustomFeedbackUi", | 129 const base::Feature kCustomFeedbackUi{"CustomFeedbackUi", |
126 base::FEATURE_DISABLED_BY_DEFAULT}; | 130 base::FEATURE_DISABLED_BY_DEFAULT}; |
127 | 131 |
128 const base::Feature kDownloadAutoResumptionThrottling{ | 132 const base::Feature kDownloadAutoResumptionThrottling{ |
129 "DownloadAutoResumptionThrottling", base::FEATURE_ENABLED_BY_DEFAULT}; | 133 "DownloadAutoResumptionThrottling", base::FEATURE_ENABLED_BY_DEFAULT}; |
130 | 134 |
131 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", | 135 const base::Feature kImportantSitesInCBD{"ImportantSitesInCBD", |
132 base::FEATURE_DISABLED_BY_DEFAULT}; | 136 base::FEATURE_DISABLED_BY_DEFAULT}; |
133 | 137 |
134 // Makes "Add to Home screen" in the app menu generate an APK for the shortcut | 138 // Makes "Add to Home screen" in the app menu generate an APK for the shortcut |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
251 return base::GetFieldTrialParamByFeatureAsBool(*feature, param_name, | 255 return base::GetFieldTrialParamByFeatureAsBool(*feature, param_name, |
252 jdefault_value); | 256 jdefault_value); |
253 } | 257 } |
254 | 258 |
255 bool RegisterChromeFeatureListJni(JNIEnv* env) { | 259 bool RegisterChromeFeatureListJni(JNIEnv* env) { |
256 return RegisterNativesImpl(env); | 260 return RegisterNativesImpl(env); |
257 } | 261 } |
258 | 262 |
259 } // namespace android | 263 } // namespace android |
260 } // namespace chrome | 264 } // namespace chrome |
OLD | NEW |