| 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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1046 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) | 1046 SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport) |
| 1047 }, | 1047 }, |
| 1048 { | 1048 { |
| 1049 "disable-office-editing-component-app", | 1049 "disable-office-editing-component-app", |
| 1050 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, | 1050 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME, |
| 1051 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, | 1051 IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, |
| 1052 kOsCrOS, | 1052 kOsCrOS, |
| 1053 SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp), | 1053 SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp), |
| 1054 }, | 1054 }, |
| 1055 { | 1055 { |
| 1056 "disable-saml-signin", | |
| 1057 IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME, | |
| 1058 IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION, | |
| 1059 kOsCrOS, | |
| 1060 SINGLE_VALUE_TYPE(chromeos::switches::kDisableSamlSignin), | |
| 1061 }, | |
| 1062 { | |
| 1063 "disable-display-color-calibration", | 1056 "disable-display-color-calibration", |
| 1064 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, | 1057 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, |
| 1065 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, | 1058 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, |
| 1066 kOsCrOS, | 1059 kOsCrOS, |
| 1067 SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), | 1060 SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), |
| 1068 }, | 1061 }, |
| 1069 #endif // defined(OS_CHROMEOS) | 1062 #endif // defined(OS_CHROMEOS) |
| 1070 { "disable-accelerated-video-decode", | 1063 { "disable-accelerated-video-decode", |
| 1071 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, | 1064 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, |
| 1072 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, | 1065 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| (...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2489 } | 2482 } |
| 2490 | 2483 |
| 2491 const Experiment* GetExperiments(size_t* count) { | 2484 const Experiment* GetExperiments(size_t* count) { |
| 2492 *count = num_experiments; | 2485 *count = num_experiments; |
| 2493 return experiments; | 2486 return experiments; |
| 2494 } | 2487 } |
| 2495 | 2488 |
| 2496 } // namespace testing | 2489 } // namespace testing |
| 2497 | 2490 |
| 2498 } // namespace about_flags | 2491 } // namespace about_flags |
| OLD | NEW |