| 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 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 SINGLE_VALUE_TYPE(chromeos::switches::kDisableQuickofficeComponentApp), | 1023 SINGLE_VALUE_TYPE(chromeos::switches::kDisableQuickofficeComponentApp), |
| 1024 }, | 1024 }, |
| 1025 { | 1025 { |
| 1026 "disable-saml-signin", | 1026 "disable-saml-signin", |
| 1027 IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME, | 1027 IDS_FLAGS_DISABLE_SAML_SIGNIN_NAME, |
| 1028 IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION, | 1028 IDS_FLAGS_DISABLE_SAML_SIGNIN_DESCRIPTION, |
| 1029 kOsCrOS, | 1029 kOsCrOS, |
| 1030 SINGLE_VALUE_TYPE(chromeos::switches::kDisableSamlSignin), | 1030 SINGLE_VALUE_TYPE(chromeos::switches::kDisableSamlSignin), |
| 1031 }, | 1031 }, |
| 1032 { | 1032 { |
| 1033 "enable-multi-profiles", | |
| 1034 IDS_FLAGS_ENABLE_MULTI_PROFILES_NAME, | |
| 1035 IDS_FLAGS_ENABLE_MULTI_PROFILES_DESCRIPTION, | |
| 1036 kOsCrOS, | |
| 1037 SINGLE_VALUE_TYPE(switches::kMultiProfiles), | |
| 1038 }, | |
| 1039 { | |
| 1040 "disable-display-color-calibration", | 1033 "disable-display-color-calibration", |
| 1041 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, | 1034 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME, |
| 1042 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, | 1035 IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, |
| 1043 kOsCrOS, | 1036 kOsCrOS, |
| 1044 SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), | 1037 SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration), |
| 1045 }, | 1038 }, |
| 1046 #endif // defined(OS_CHROMEOS) | 1039 #endif // defined(OS_CHROMEOS) |
| 1047 { "disable-accelerated-video-decode", | 1040 { "disable-accelerated-video-decode", |
| 1048 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, | 1041 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, |
| 1049 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, | 1042 IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, |
| (...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2397 } | 2390 } |
| 2398 | 2391 |
| 2399 const Experiment* GetExperiments(size_t* count) { | 2392 const Experiment* GetExperiments(size_t* count) { |
| 2400 *count = num_experiments; | 2393 *count = num_experiments; |
| 2401 return experiments; | 2394 return experiments; |
| 2402 } | 2395 } |
| 2403 | 2396 |
| 2404 } // namespace testing | 2397 } // namespace testing |
| 2405 | 2398 |
| 2406 } // namespace about_flags | 2399 } // namespace about_flags |
| OLD | NEW |