| 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 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 {"enable-password-separated-signin-flow", | 1179 {"enable-password-separated-signin-flow", |
| 1180 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, | 1180 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME, |
| 1181 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, | 1181 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, |
| 1182 kOsMac | kOsWin | kOsLinux, | 1182 kOsMac | kOsWin | kOsLinux, |
| 1183 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, | 1183 FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, |
| 1184 {"enable-material-design-user-manager", | 1184 {"enable-material-design-user-manager", |
| 1185 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_NAME, | 1185 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_NAME, |
| 1186 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_DESCRIPTION, | 1186 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_USER_MANAGER_DESCRIPTION, |
| 1187 kOsMac | kOsWin | kOsLinux, | 1187 kOsMac | kOsWin | kOsLinux, |
| 1188 FEATURE_VALUE_TYPE(switches::kMaterialDesignUserManager)}, | 1188 FEATURE_VALUE_TYPE(switches::kMaterialDesignUserManager)}, |
| 1189 {"show-material-design-user-menu", |
| 1190 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_NAME, |
| 1191 IDS_FLAGS_SHOW_MATERIAL_DESIGN_USER_MENU_DESCRIPTION, |
| 1192 kOsMac | kOsWin | kOsLinux, |
| 1193 FEATURE_VALUE_TYPE(switches::kMaterialDesignUserMenu)}, |
| 1189 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, | 1194 {"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME, |
| 1190 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, | 1195 IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux, |
| 1191 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, | 1196 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, |
| 1192 #if defined(ENABLE_APP_LIST) | 1197 #if defined(ENABLE_APP_LIST) |
| 1193 {"reset-app-list-install-state", | 1198 {"reset-app-list-install-state", |
| 1194 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, | 1199 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, |
| 1195 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1200 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1196 kOsMac | kOsWin | kOsLinux, | 1201 kOsMac | kOsWin | kOsLinux, |
| 1197 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, | 1202 SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)}, |
| 1198 #endif | 1203 #endif |
| (...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2107 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2112 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2108 | 2113 |
| 2109 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2114 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2110 *count = arraysize(kFeatureEntries); | 2115 *count = arraysize(kFeatureEntries); |
| 2111 return kFeatureEntries; | 2116 return kFeatureEntries; |
| 2112 } | 2117 } |
| 2113 | 2118 |
| 2114 } // namespace testing | 2119 } // namespace testing |
| 2115 | 2120 |
| 2116 } // namespace about_flags | 2121 } // namespace about_flags |
| OLD | NEW |