| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1035 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 1035 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| 1036 }, | 1036 }, |
| 1037 #if defined(USE_ASH) | 1037 #if defined(USE_ASH) |
| 1038 { | 1038 { |
| 1039 "ash-debug-shortcuts", | 1039 "ash-debug-shortcuts", |
| 1040 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, | 1040 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| 1041 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 1041 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| 1042 kOsAll, | 1042 kOsAll, |
| 1043 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1043 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 1044 }, | 1044 }, |
| 1045 { "ash-alternate-caption-button", | |
| 1046 IDS_FLAGS_ASH_FRAME_CAPTION_BUTTON_STYLE_NAME, | |
| 1047 IDS_FLAGS_ASH_FRAME_CAPTION_BUTTON_STYLE_DESCRIPTION, | |
| 1048 kOsCrOS, | |
| 1049 ENABLE_DISABLE_VALUE_TYPE( | |
| 1050 ash::switches::kAshEnableAlternateFrameCaptionButtonStyle, | |
| 1051 ash::switches::kAshDisableAlternateFrameCaptionButtonStyle), | |
| 1052 }, | |
| 1053 { "ash-enable-touch-view-testing", | 1045 { "ash-enable-touch-view-testing", |
| 1054 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1046 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| 1055 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1047 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| 1056 kOsCrOS, | 1048 kOsCrOS, |
| 1057 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1049 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| 1058 }, | 1050 }, |
| 1059 #endif | 1051 #endif |
| 1060 #if defined(OS_CHROMEOS) | 1052 #if defined(OS_CHROMEOS) |
| 1061 { | 1053 { |
| 1062 "enable-carrier-switching", | 1054 "enable-carrier-switching", |
| (...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2367 } | 2359 } |
| 2368 | 2360 |
| 2369 const Experiment* GetExperiments(size_t* count) { | 2361 const Experiment* GetExperiments(size_t* count) { |
| 2370 *count = num_experiments; | 2362 *count = num_experiments; |
| 2371 return experiments; | 2363 return experiments; |
| 2372 } | 2364 } |
| 2373 | 2365 |
| 2374 } // namespace testing | 2366 } // namespace testing |
| 2375 | 2367 |
| 2376 } // namespace about_flags | 2368 } // namespace about_flags |
| OLD | NEW |