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 <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <iterator> | 10 #include <iterator> |
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
958 }, | 958 }, |
959 #if defined(USE_ASH) | 959 #if defined(USE_ASH) |
960 { | 960 { |
961 "show-launcher-alignment-menu", | 961 "show-launcher-alignment-menu", |
962 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, | 962 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, |
963 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, | 963 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, |
964 kOsAll, | 964 kOsAll, |
965 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) | 965 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) |
966 }, | 966 }, |
967 { | 967 { |
| 968 "disable-minimize-on-second-launcher-item-click", |
| 969 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
| 970 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
| 971 kOsAll, |
| 972 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
| 973 }, |
| 974 { |
968 "show-touch-hud", | 975 "show-touch-hud", |
969 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, | 976 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, |
970 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, | 977 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, |
971 kOsAll, | 978 kOsAll, |
972 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) | 979 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud) |
973 }, | 980 }, |
974 { | 981 { |
975 "enable-pinch", | 982 "enable-pinch", |
976 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 983 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
977 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 984 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1858 } | 1865 } |
1859 | 1866 |
1860 const Experiment* GetExperiments(size_t* count) { | 1867 const Experiment* GetExperiments(size_t* count) { |
1861 *count = num_experiments; | 1868 *count = num_experiments; |
1862 return experiments; | 1869 return experiments; |
1863 } | 1870 } |
1864 | 1871 |
1865 } // namespace testing | 1872 } // namespace testing |
1866 | 1873 |
1867 } // namespace about_flags | 1874 } // namespace about_flags |
OLD | NEW |