| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index cfc4aed80a21fa130fffed74dca689ee62f22a82..f9162997742e40152e5413bc5a89705d6a92cc49 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -928,7 +928,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
|
| {"enable-password-generation", IDS_FLAGS_PASSWORD_GENERATION_NAME,
|
| IDS_FLAGS_PASSWORD_GENERATION_DESCRIPTION,
|
| - kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration,
|
| autofill::switches::kDisablePasswordGeneration)},
|
| {"enable-automatic-password-saving",
|
| @@ -951,7 +951,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| password_manager::features::kEnableManualPasswordGeneration)},
|
| {"affiliation-based-matching", IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME,
|
| IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION,
|
| - kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
|
| + kOsAll,
|
| FEATURE_VALUE_TYPE(password_manager::features::kAffiliationBasedMatching)},
|
| {"wallet-service-use-sandbox", IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME,
|
| IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_DESCRIPTION, kOsAndroid | kOsDesktop,
|
| @@ -973,7 +973,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| switches::kScrollEndEffect,
|
| "0")},
|
| {"enable-icon-ntp", IDS_FLAGS_ICON_NTP_NAME, IDS_FLAGS_ICON_NTP_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp,
|
| switches::kDisableIconNtp)},
|
| {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME,
|
| @@ -992,6 +992,11 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_ENABLE_NON_VALIDATING_RELOAD_ON_REFRESH_CONTENT_DESCRIPTION,
|
| kOsAndroid,
|
| FEATURE_VALUE_TYPE(features::kNonValidatingReloadOnRefreshContent)},
|
| + {"enable-non-validating-reload-on-normal-reload",
|
| + IDS_FLAGS_ENABLE_NON_VALIDATING_RELOAD_ON_NORMAL_RELOAD_NAME,
|
| + IDS_FLAGS_ENABLE_NON_VALIDATING_RELOAD_ON_NORMAL_RELOAD_DESCRIPTION,
|
| + kOsAll,
|
| + FEATURE_VALUE_TYPE(features::kNonValidatingReloadOnNormalReload)},
|
| {"trace-upload-url", IDS_FLAGS_TRACE_UPLOAD_URL,
|
| IDS_FLAGS_TRACE_UPLOAD_URL_DESCRIPTION, kOsAll,
|
| MULTI_VALUE_TYPE(kTraceUploadURL)},
|
| @@ -1007,7 +1012,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"enable-supervised-user-managed-bookmarks-folder",
|
| IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
|
| IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)},
|
| #if defined(ENABLE_APP_LIST)
|
| {"enable-sync-app-list", IDS_FLAGS_SYNC_APP_LIST_NAME,
|
| @@ -1138,12 +1143,12 @@ const FeatureEntry kFeatureEntries[] = {
|
| SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)},
|
| {"enable-new-profile-management", IDS_FLAGS_NEW_PROFILE_MANAGEMENT_NAME,
|
| IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement,
|
| switches::kDisableNewProfileManagement)},
|
| {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME,
|
| IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency,
|
| switches::kDisableAccountConsistency)},
|
| {"enable-password-separated-signin-flow",
|
| @@ -1254,7 +1259,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| switches::kDisablePermissionsBlacklist)},
|
| {"enable-single-click-autofill", IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME,
|
| IDS_FLAGS_SINGLE_CLICK_AUTOFILL_DESCRIPTION,
|
| - kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| autofill::switches::kEnableSingleClickAutofill,
|
| autofill::switches::kDisableSingleClickAutofill)},
|
| @@ -1292,7 +1297,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| #endif
|
| {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME,
|
| IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION,
|
| - kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac,
|
| + kOsAll,
|
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
|
| {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME,
|
| IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop,
|
| @@ -1475,7 +1480,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")},
|
| {"enable-child-account-detection", IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME,
|
| IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection,
|
| switches::kDisableChildAccountDetection)},
|
| #if defined(OS_CHROMEOS) && defined(USE_OZONE)
|
| @@ -1518,7 +1523,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| #endif // defined(OS_CHROMEOS)
|
| {"supervised-user-safesites", IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME,
|
| IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION,
|
| - kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
|
| + kOsAll,
|
| MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)},
|
| #if defined(OS_ANDROID)
|
| {"enable-autofill-keyboard-accessory-view",
|
| @@ -1673,7 +1678,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"enable-autofill-credit-card-upload",
|
| IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME,
|
| IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION,
|
| - kOsCrOS | kOsWin | kOsLinux | kOsAndroid | kOsMac,
|
| + kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| autofill::switches::kEnableOfferUploadCreditCards,
|
| autofill::switches::kDisableOfferUploadCreditCards)},
|
|
|