| 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 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1046 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_DESCRIPTION, | 1046 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| 1047 kOsCrOS, | 1047 kOsCrOS, |
| 1048 SINGLE_VALUE_TYPE(switches::kEnableTouchFeedback), | 1048 SINGLE_VALUE_TYPE(switches::kEnableTouchFeedback), |
| 1049 }, | 1049 }, |
| 1050 { "ash-disable-text-filtering-in-overview-mode", | 1050 { "ash-disable-text-filtering-in-overview-mode", |
| 1051 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, | 1051 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_NAME, |
| 1052 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, | 1052 IDS_FLAGS_ASH_DISABLE_TEXT_FILTERING_IN_OVERVIEW_MODE_DESCRIPTION, |
| 1053 kOsCrOS, | 1053 kOsCrOS, |
| 1054 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), | 1054 SINGLE_VALUE_TYPE(ash::switches::kAshDisableTextFilteringInOverviewMode), |
| 1055 }, | 1055 }, |
| 1056 { "ash-enable-mirrored-screen", |
| 1057 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, |
| 1058 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, |
| 1059 kOsCrOS, |
| 1060 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
| 1061 }, |
| 1056 #endif // defined(USE_ASH) | 1062 #endif // defined(USE_ASH) |
| 1057 #if defined(OS_CHROMEOS) | 1063 #if defined(OS_CHROMEOS) |
| 1058 { | 1064 { |
| 1059 "enable-carrier-switching", | 1065 "enable-carrier-switching", |
| 1060 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1066 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| 1061 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1067 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| 1062 kOsCrOS, | 1068 kOsCrOS, |
| 1063 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) | 1069 SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching) |
| 1064 }, | 1070 }, |
| 1065 { | 1071 { |
| (...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2635 } | 2641 } |
| 2636 | 2642 |
| 2637 const Experiment* GetExperiments(size_t* count) { | 2643 const Experiment* GetExperiments(size_t* count) { |
| 2638 *count = num_experiments; | 2644 *count = num_experiments; |
| 2639 return experiments; | 2645 return experiments; |
| 2640 } | 2646 } |
| 2641 | 2647 |
| 2642 } // namespace testing | 2648 } // namespace testing |
| 2643 | 2649 |
| 2644 } // namespace about_flags | 2650 } // namespace about_flags |
| OLD | NEW |