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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1080 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 1080 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
1081 kOsAll, | 1081 kOsAll, |
1082 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1082 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
1083 }, | 1083 }, |
1084 { "ash-enable-touch-view-testing", | 1084 { "ash-enable-touch-view-testing", |
1085 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1085 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
1086 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1086 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
1087 kOsCrOS, | 1087 kOsCrOS, |
1088 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1088 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
1089 }, | 1089 }, |
| 1090 { "ash-disable-text-filtering-in-overview-mode", |
| 1091 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
| 1092 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
| 1093 kOsCrOS, |
| 1094 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
| 1095 }, |
1090 #endif | 1096 #endif |
1091 #if defined(OS_CHROMEOS) | 1097 #if defined(OS_CHROMEOS) |
1092 { | 1098 { |
1093 "enable-carrier-switching", | 1099 "enable-carrier-switching", |
1094 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1100 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1095 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1101 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1096 kOsCrOS, | 1102 kOsCrOS, |
1097 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1103 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
1098 }, | 1104 }, |
1099 { | 1105 { |
(...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2476 } | 2482 } |
2477 | 2483 |
2478 const Experiment* GetExperiments(size_t* count) { | 2484 const Experiment* GetExperiments(size_t* count) { |
2479 *count = num_experiments; | 2485 *count = num_experiments; |
2480 return experiments; | 2486 return experiments; |
2481 } | 2487 } |
2482 | 2488 |
2483 } // namespace testing | 2489 } // namespace testing |
2484 | 2490 |
2485 } // namespace about_flags | 2491 } // namespace about_flags |
OLD | NEW |