| 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 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1057 { | 1057 { |
| 1058 "ash-enable-screen-rotation-animations", | 1058 "ash-enable-screen-rotation-animations", |
| 1059 IDS_FLAGS_ASH_ENABLE_SCREEN_ROTATION_ANIMATION_NAME, | 1059 IDS_FLAGS_ASH_ENABLE_SCREEN_ROTATION_ANIMATION_NAME, |
| 1060 IDS_FLAGS_ASH_ENABLE_SCREEN_ROTATION_ANIMATION_DESCRIPTION, | 1060 IDS_FLAGS_ASH_ENABLE_SCREEN_ROTATION_ANIMATION_DESCRIPTION, |
| 1061 kOsCrOS, | 1061 kOsCrOS, |
| 1062 MULTI_VALUE_TYPE(kAshScreenRotationAnimationChoices) | 1062 MULTI_VALUE_TYPE(kAshScreenRotationAnimationChoices) |
| 1063 }, | 1063 }, |
| 1064 #endif // defined(USE_ASH) | 1064 #endif // defined(USE_ASH) |
| 1065 #if defined(OS_CHROMEOS) | 1065 #if defined(OS_CHROMEOS) |
| 1066 { | 1066 { |
| 1067 "enable-carrier-switching", | |
| 1068 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | |
| 1069 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | |
| 1070 kOsCrOS, | |
| 1071 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | |
| 1072 }, | |
| 1073 { | |
| 1074 "disable-cloud-import", | 1067 "disable-cloud-import", |
| 1075 IDS_FLAGS_DISABLE_CLOUD_IMPORT, | 1068 IDS_FLAGS_DISABLE_CLOUD_IMPORT, |
| 1076 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, | 1069 IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION, |
| 1077 kOsCrOS, | 1070 kOsCrOS, |
| 1078 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport) | 1071 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport) |
| 1079 }, | 1072 }, |
| 1080 { | 1073 { |
| 1081 "enable-request-tablet-site", | 1074 "enable-request-tablet-site", |
| 1082 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, | 1075 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME, |
| 1083 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION, | 1076 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION, |
| (...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2933 } | 2926 } |
| 2934 | 2927 |
| 2935 const Experiment* GetExperiments(size_t* count) { | 2928 const Experiment* GetExperiments(size_t* count) { |
| 2936 *count = num_experiments; | 2929 *count = num_experiments; |
| 2937 return experiments; | 2930 return experiments; |
| 2938 } | 2931 } |
| 2939 | 2932 |
| 2940 } // namespace testing | 2933 } // namespace testing |
| 2941 | 2934 |
| 2942 } // namespace about_flags | 2935 } // namespace about_flags |
| OLD | NEW |