| 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, | 922 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 923 kOsWin | kOsLinux | kOsCrOS, | 923 kOsWin | kOsLinux | kOsCrOS, |
| 924 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) | 924 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) |
| 925 }, | 925 }, |
| 926 #if defined(OS_CHROMEOS) | 926 #if defined(OS_CHROMEOS) |
| 927 { | 927 { |
| 928 "ash-use-alternate-shelf", | 928 "ash-use-alternate-shelf", |
| 929 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, | 929 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME, |
| 930 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, | 930 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION, |
| 931 kOsCrOS, | 931 kOsCrOS, |
| 932 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout) | 932 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout, |
| 933 ash::switches::kAshDisableAlternateShelfLayout) |
| 933 }, | 934 }, |
| 934 { | 935 { |
| 935 "enable-background-loader", | 936 "enable-background-loader", |
| 936 IDS_ENABLE_BACKLOADER_NAME, | 937 IDS_ENABLE_BACKLOADER_NAME, |
| 937 IDS_ENABLE_BACKLOADER_DESCRIPTION, | 938 IDS_ENABLE_BACKLOADER_DESCRIPTION, |
| 938 kOsCrOS, | 939 kOsCrOS, |
| 939 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) | 940 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) |
| 940 }, | 941 }, |
| 941 { | 942 { |
| 942 "enable-screensaver-extension", | 943 "enable-screensaver-extension", |
| (...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2114 } | 2115 } |
| 2115 | 2116 |
| 2116 const Experiment* GetExperiments(size_t* count) { | 2117 const Experiment* GetExperiments(size_t* count) { |
| 2117 *count = num_experiments; | 2118 *count = num_experiments; |
| 2118 return experiments; | 2119 return experiments; |
| 2119 } | 2120 } |
| 2120 | 2121 |
| 2121 } // namespace testing | 2122 } // namespace testing |
| 2122 | 2123 |
| 2123 } // namespace about_flags | 2124 } // namespace about_flags |
| OLD | NEW |