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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin) | 699 SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin) |
700 }, | 700 }, |
701 #if defined(USE_ASH) | 701 #if defined(USE_ASH) |
702 { | 702 { |
703 "enable-applist-v2", | 703 "enable-applist-v2", |
704 IDS_FLAGS_ENABLE_APPLIST_V2_NAME, | 704 IDS_FLAGS_ENABLE_APPLIST_V2_NAME, |
705 IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION, | 705 IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION, |
706 kOsAll, | 706 kOsAll, |
707 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2), | 707 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2), |
708 }, | 708 }, |
| 709 { |
| 710 "show-launcher-alignment-menu", |
| 711 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, |
| 712 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, |
| 713 kOsAll, |
| 714 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) |
| 715 }, |
709 #endif | 716 #endif |
710 }; | 717 }; |
711 | 718 |
712 const Experiment* experiments = kExperiments; | 719 const Experiment* experiments = kExperiments; |
713 size_t num_experiments = arraysize(kExperiments); | 720 size_t num_experiments = arraysize(kExperiments); |
714 | 721 |
715 // Stores and encapsulates the little state that about:flags has. | 722 // Stores and encapsulates the little state that about:flags has. |
716 class FlagsState { | 723 class FlagsState { |
717 public: | 724 public: |
718 FlagsState() : needs_restart_(false) {} | 725 FlagsState() : needs_restart_(false) {} |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1135 } | 1142 } |
1136 | 1143 |
1137 const Experiment* GetExperiments(size_t* count) { | 1144 const Experiment* GetExperiments(size_t* count) { |
1138 *count = num_experiments; | 1145 *count = num_experiments; |
1139 return experiments; | 1146 return experiments; |
1140 } | 1147 } |
1141 | 1148 |
1142 } // namespace testing | 1149 } // namespace testing |
1143 | 1150 |
1144 } // namespace about_flags | 1151 } // namespace about_flags |
OLD | NEW |