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 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 1021 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
1022 kOsAll, | 1022 kOsAll, |
1023 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1023 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
1024 }, | 1024 }, |
1025 { "ash-enable-touch-view-testing", | 1025 { "ash-enable-touch-view-testing", |
1026 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1026 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
1027 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1027 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
1028 kOsCrOS, | 1028 kOsCrOS, |
1029 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1029 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
1030 }, | 1030 }, |
| 1031 #if defined(OS_CHROMEOS) |
| 1032 { |
| 1033 "ash-enable-touch-view-touch-feedback", |
| 1034 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_NAME, |
| 1035 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TOUCH_FEEDBACK_DESCRIPTION, |
| 1036 kOsCrOS, |
| 1037 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTouchFeedback), |
| 1038 }, |
| 1039 #endif // defined(OS_CHROMEOS) |
1031 { "ash-disable-text-filtering-in-overview-mode", | 1040 { "ash-disable-text-filtering-in-overview-mode", |
1032 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, | 1041 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
1033 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, | 1042 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
1034 kOsCrOS, | 1043 kOsCrOS, |
1035 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), | 1044 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
1036 }, | 1045 }, |
1037 #endif | 1046 #endif // defined(USE_ASH) |
1038 #if defined(OS_CHROMEOS) | 1047 #if defined(OS_CHROMEOS) |
1039 { | 1048 { |
1040 "enable-carrier-switching", | 1049 "enable-carrier-switching", |
1041 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1050 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1042 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1051 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1043 kOsCrOS, | 1052 kOsCrOS, |
1044 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1053 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
1045 }, | 1054 }, |
1046 { | 1055 { |
1047 "enable-request-tablet-site", | 1056 "enable-request-tablet-site", |
(...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2473 } | 2482 } |
2474 | 2483 |
2475 const Experiment* GetExperiments(size_t* count) { | 2484 const Experiment* GetExperiments(size_t* count) { |
2476 *count = num_experiments; | 2485 *count = num_experiments; |
2477 return experiments; | 2486 return experiments; |
2478 } | 2487 } |
2479 | 2488 |
2480 } // namespace testing | 2489 } // namespace testing |
2481 | 2490 |
2482 } // namespace about_flags | 2491 } // namespace about_flags |
OLD | NEW |