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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1432 flag_descriptions::kOfficeEditingComponentAppDescription, kOsCrOS, | 1432 flag_descriptions::kOfficeEditingComponentAppDescription, kOsCrOS, |
1433 SINGLE_DISABLE_VALUE_TYPE( | 1433 SINGLE_DISABLE_VALUE_TYPE( |
1434 chromeos::switches::kDisableOfficeEditingComponentApp), | 1434 chromeos::switches::kDisableOfficeEditingComponentApp), |
1435 }, | 1435 }, |
1436 { | 1436 { |
1437 "disable-display-color-calibration", | 1437 "disable-display-color-calibration", |
1438 flag_descriptions::kDisplayColorCalibrationName, | 1438 flag_descriptions::kDisplayColorCalibrationName, |
1439 flag_descriptions::kDisplayColorCalibrationDescription, kOsCrOS, | 1439 flag_descriptions::kDisplayColorCalibrationDescription, kOsCrOS, |
1440 SINGLE_DISABLE_VALUE_TYPE(::switches::kDisableDisplayColorCalibration), | 1440 SINGLE_DISABLE_VALUE_TYPE(::switches::kDisableDisplayColorCalibration), |
1441 }, | 1441 }, |
1442 { | |
1443 "new-app-list-ui", flag_descriptions::kEnableNewAppListUIName, | |
1444 flag_descriptions::kEnableNewAppListUIDescription, kOsCrOS, | |
1445 SINGLE_VALUE_TYPE(app_list::switches::kEnableNewAppListUI), | |
stevenjb
2017/06/30 21:17:25
Is there a better descriptor here than "new"?
newcomer
2017/06/30 21:40:23
Fixed.
| |
1446 }, | |
1442 {"instant-tethering", flag_descriptions::kTetherName, | 1447 {"instant-tethering", flag_descriptions::kTetherName, |
1443 flag_descriptions::kTetherDescription, kOsCrOS, | 1448 flag_descriptions::kTetherDescription, kOsCrOS, |
1444 FEATURE_VALUE_TYPE(features::kInstantTethering)}, | 1449 FEATURE_VALUE_TYPE(features::kInstantTethering)}, |
1445 #endif // OS_CHROMEOS | 1450 #endif // OS_CHROMEOS |
1446 { | 1451 { |
1447 "disable-accelerated-video-decode", | 1452 "disable-accelerated-video-decode", |
1448 flag_descriptions::kAcceleratedVideoDecodeName, | 1453 flag_descriptions::kAcceleratedVideoDecodeName, |
1449 flag_descriptions::kAcceleratedVideoDecodeDescription, | 1454 flag_descriptions::kAcceleratedVideoDecodeDescription, |
1450 kOsMac | kOsWin | kOsCrOS | kOsAndroid, | 1455 kOsMac | kOsWin | kOsCrOS | kOsAndroid, |
1451 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 1456 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3329 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3334 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3330 | 3335 |
3331 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3336 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3332 *count = arraysize(kFeatureEntries); | 3337 *count = arraysize(kFeatureEntries); |
3333 return kFeatureEntries; | 3338 return kFeatureEntries; |
3334 } | 3339 } |
3335 | 3340 |
3336 } // namespace testing | 3341 } // namespace testing |
3337 | 3342 |
3338 } // namespace about_flags | 3343 } // namespace about_flags |
OLD | NEW |