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 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1031 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 1031 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
1032 kOsAll, | 1032 kOsAll, |
1033 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1033 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
1034 }, | 1034 }, |
1035 { "ash-enable-touch-view-testing", | 1035 { "ash-enable-touch-view-testing", |
1036 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1036 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
1037 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1037 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
1038 kOsCrOS, | 1038 kOsCrOS, |
1039 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1039 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
1040 }, | 1040 }, |
| 1041 #if defined(OS_CHROMEOS) |
| 1042 { |
| 1043 "ash-enable-touch-view-touch-feedback", |
| 1044 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_NAME, |
| 1045 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_DESCRIPTION, |
| 1046 kOsCrOS, |
| 1047 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTouchFeedback), |
| 1048 }, |
| 1049 #endif // defined(OS_CHROMEOS) |
1041 { "ash-disable-text-filtering-in-overview-mode", | 1050 { "ash-disable-text-filtering-in-overview-mode", |
1042 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, | 1051 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
1043 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, | 1052 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
1044 kOsCrOS, | 1053 kOsCrOS, |
1045 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), | 1054 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
1046 }, | 1055 }, |
1047 #endif | 1056 #endif // defined(USE_ASH) |
1048 #if defined(OS_CHROMEOS) | 1057 #if defined(OS_CHROMEOS) |
1049 { | 1058 { |
1050 "enable-carrier-switching", | 1059 "enable-carrier-switching", |
1051 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1060 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1052 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1061 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1053 kOsCrOS, | 1062 kOsCrOS, |
1054 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1063 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
1055 }, | 1064 }, |
1056 { | 1065 { |
1057 "enable-request-tablet-site", | 1066 "enable-request-tablet-site", |
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2491 } | 2500 } |
2492 | 2501 |
2493 const Experiment* GetExperiments(size_t* count) { | 2502 const Experiment* GetExperiments(size_t* count) { |
2494 *count = num_experiments; | 2503 *count = num_experiments; |
2495 return experiments; | 2504 return experiments; |
2496 } | 2505 } |
2497 | 2506 |
2498 } // namespace testing | 2507 } // namespace testing |
2499 | 2508 |
2500 } // namespace about_flags | 2509 } // namespace about_flags |
OLD | NEW |