| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2229 flag_descriptions::kEnableMaterialDesignBookmarksName, | 2229 flag_descriptions::kEnableMaterialDesignBookmarksName, |
| 2230 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop, | 2230 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop, |
| 2231 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, | 2231 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, |
| 2232 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName, | 2232 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName, |
| 2233 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop, | 2233 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop, |
| 2234 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, | 2234 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, |
| 2235 {"enable-md-incognito-ntp", | 2235 {"enable-md-incognito-ntp", |
| 2236 flag_descriptions::kMaterialDesignIncognitoNTPName, | 2236 flag_descriptions::kMaterialDesignIncognitoNTPName, |
| 2237 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAll, | 2237 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAll, |
| 2238 FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)}, | 2238 FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)}, |
| 2239 {"enable-md-settings", flag_descriptions::kEnableMaterialDesignSettingsName, | |
| 2240 flag_descriptions::kEnableMaterialDesignSettingsDescription, kOsDesktop, | |
| 2241 FEATURE_VALUE_TYPE(features::kMaterialDesignSettings)}, | |
| 2242 {"safe-search-url-reporting", | 2239 {"safe-search-url-reporting", |
| 2243 flag_descriptions::kSafeSearchUrlReportingName, | 2240 flag_descriptions::kSafeSearchUrlReportingName, |
| 2244 flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll, | 2241 flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll, |
| 2245 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)}, | 2242 FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)}, |
| 2246 {"force-ui-direction", flag_descriptions::kForceUiDirectionName, | 2243 {"force-ui-direction", flag_descriptions::kForceUiDirectionName, |
| 2247 flag_descriptions::kForceUiDirectionDescription, kOsAll, | 2244 flag_descriptions::kForceUiDirectionDescription, kOsAll, |
| 2248 MULTI_VALUE_TYPE(kForceUIDirectionChoices)}, | 2245 MULTI_VALUE_TYPE(kForceUIDirectionChoices)}, |
| 2249 {"force-text-direction", flag_descriptions::kForceTextDirectionName, | 2246 {"force-text-direction", flag_descriptions::kForceTextDirectionName, |
| 2250 flag_descriptions::kForceTextDirectionDescription, kOsAll, | 2247 flag_descriptions::kForceTextDirectionDescription, kOsAll, |
| 2251 MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, | 2248 MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, |
| (...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3272 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3269 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 3273 | 3270 |
| 3274 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3271 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 3275 *count = arraysize(kFeatureEntries); | 3272 *count = arraysize(kFeatureEntries); |
| 3276 return kFeatureEntries; | 3273 return kFeatureEntries; |
| 3277 } | 3274 } |
| 3278 | 3275 |
| 3279 } // namespace testing | 3276 } // namespace testing |
| 3280 | 3277 |
| 3281 } // namespace about_flags | 3278 } // namespace about_flags |
| OLD | NEW |