| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 5162be2ac041942e289b6840d75d9014b102aa3d..c0022bdb6c8da16f880c6b90f21f093cb2bb0e0f 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -285,13 +285,12 @@ const FeatureEntry::Choice kReaderModeHeuristicsChoices[] = {
|
| };
|
| #endif
|
|
|
| -const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
|
| - { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| - { IDS_FLAGS_NUM_RASTER_THREADS_ONE, switches::kNumRasterThreads, "1" },
|
| - { IDS_FLAGS_NUM_RASTER_THREADS_TWO, switches::kNumRasterThreads, "2" },
|
| - { IDS_FLAGS_NUM_RASTER_THREADS_THREE, switches::kNumRasterThreads, "3" },
|
| - { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" }
|
| -};
|
| +const FeatureEntry::Choice kNumWorkerThreadsChoices[] = {
|
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
|
| + {IDS_FLAGS_NUM_WORKER_THREADS_ONE, switches::kNumWorkerThreads, "1"},
|
| + {IDS_FLAGS_NUM_WORKER_THREADS_TWO, switches::kNumWorkerThreads, "2"},
|
| + {IDS_FLAGS_NUM_WORKER_THREADS_THREE, switches::kNumWorkerThreads, "3"},
|
| + {IDS_FLAGS_NUM_WORKER_THREADS_FOUR, switches::kNumWorkerThreads, "4"}};
|
|
|
| const FeatureEntry::Choice kGpuRasterizationMSAASampleCountChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT,
|
| @@ -715,8 +714,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME,
|
| IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION, kOsMac | kOsWin | kOsLinux,
|
| SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)},
|
| - {"mhtml-generator-option",
|
| - IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME,
|
| + {"mhtml-generator-option", IDS_FLAGS_MHTML_GENERATOR_OPTION_NAME,
|
| IDS_FLAGS_MHTML_GENERATOR_OPTION_DESCRIPTION, kOsMac | kOsWin | kOsLinux,
|
| MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)},
|
| {"enable-quic", IDS_FLAGS_QUIC_NAME, IDS_FLAGS_QUIC_DESCRIPTION, kOsAll,
|
| @@ -949,8 +947,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_DEBUG_PACKED_APP_DESCRIPTION, kOsDesktop,
|
| SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
|
| {"enable-password-generation", IDS_FLAGS_PASSWORD_GENERATION_NAME,
|
| - IDS_FLAGS_PASSWORD_GENERATION_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_PASSWORD_GENERATION_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration,
|
| autofill::switches::kDisablePasswordGeneration)},
|
| {"enable-automatic-password-saving",
|
| @@ -972,8 +969,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| FEATURE_VALUE_TYPE(
|
| password_manager::features::kEnableManualPasswordGeneration)},
|
| {"affiliation-based-matching", IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME,
|
| - IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION, 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,
|
| @@ -995,9 +991,8 @@ const FeatureEntry kFeatureEntries[] = {
|
| switches::kScrollEndEffect,
|
| "0")},
|
| {"enable-icon-ntp", IDS_FLAGS_ICON_NTP_NAME, IDS_FLAGS_ICON_NTP_DESCRIPTION,
|
| - kOsAll,
|
| - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp,
|
| - switches::kDisableIconNtp)},
|
| + kOsAll, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp,
|
| + switches::kDisableIconNtp)},
|
| {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME,
|
| IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop,
|
| @@ -1017,8 +1012,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"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)},
|
| + 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)},
|
| @@ -1033,8 +1027,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| autofill::switches::kEnableSuggestionsWithSubstringMatch)},
|
| {"enable-supervised-user-managed-bookmarks-folder",
|
| IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
|
| - IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION, kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)},
|
| #if defined(ENABLE_APP_LIST)
|
| {"enable-sync-app-list", IDS_FLAGS_SYNC_APP_LIST_NAME,
|
| @@ -1167,13 +1160,11 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION, kOsAll,
|
| SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)},
|
| {"enable-new-profile-management", IDS_FLAGS_NEW_PROFILE_MANAGEMENT_NAME,
|
| - IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement,
|
| switches::kDisableNewProfileManagement)},
|
| {"enable-account-consistency", IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME,
|
| - IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency,
|
| switches::kDisableAccountConsistency)},
|
| {"enable-password-separated-signin-flow",
|
| @@ -1275,9 +1266,9 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid,
|
| MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)},
|
| #endif
|
| - {"num-raster-threads", IDS_FLAGS_NUM_RASTER_THREADS_NAME,
|
| - IDS_FLAGS_NUM_RASTER_THREADS_DESCRIPTION, kOsAll,
|
| - MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
|
| + {"num-raster-threads", IDS_FLAGS_NUM_WORKER_THREADS_NAME,
|
| + IDS_FLAGS_NUM_WORKER_THREADS_DESCRIPTION, kOsAll,
|
| + MULTI_VALUE_TYPE(kNumWorkerThreadsChoices)},
|
| {"enable-permission-action-reporting",
|
| IDS_FLAGS_PERMISSION_ACTION_REPORTING_NAME,
|
| IDS_FLAGS_PERMISSION_ACTION_REPORTING_DESCRIPTION, kOsAll,
|
| @@ -1288,8 +1279,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePermissionsBlacklist,
|
| switches::kDisablePermissionsBlacklist)},
|
| {"enable-single-click-autofill", IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME,
|
| - IDS_FLAGS_SINGLE_CLICK_AUTOFILL_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_SINGLE_CLICK_AUTOFILL_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| autofill::switches::kEnableSingleClickAutofill,
|
| autofill::switches::kDisableSingleClickAutofill)},
|
| @@ -1326,8 +1316,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| app_list::switches::kDisableNewAppListMixer)},
|
| #endif
|
| {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME,
|
| - IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, kOsAll,
|
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
|
| {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME,
|
| IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop,
|
| @@ -1509,8 +1498,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| switches::kSyncServiceURL,
|
| "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,
|
| - kOsAll,
|
| + IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection,
|
| switches::kDisableChildAccountDetection)},
|
| #if defined(OS_CHROMEOS) && defined(USE_OZONE)
|
| @@ -1552,8 +1540,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| MULTI_VALUE_TYPE(kDataSaverPromptChoices)},
|
| #endif // defined(OS_CHROMEOS)
|
| {"supervised-user-safesites", IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME,
|
| - IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION, kOsAll,
|
| MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)},
|
| #if defined(OS_ANDROID)
|
| {"enable-autofill-keyboard-accessory-view",
|
| @@ -1701,8 +1688,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| #if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
|
| {"enable-autofill-credit-card-upload",
|
| IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_NAME,
|
| - IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION,
|
| - kOsAll,
|
| + IDS_FLAGS_AUTOFILL_CREDIT_CARD_UPLOAD_DESCRIPTION, kOsAll,
|
| ENABLE_DISABLE_VALUE_TYPE(
|
| autofill::switches::kEnableOfferUploadCreditCards,
|
| autofill::switches::kDisableOfferUploadCreditCards)},
|
| @@ -1905,8 +1891,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_NAME,
|
| IDS_FLAGS_OPTIMIZE_LOADING_IPC_FOR_SMALL_RESOURCES_DESCRIPTION, kOsAll,
|
| FEATURE_VALUE_TYPE(features::kOptimizeLoadingIPCForSmallResources)},
|
| - {"enable-font-cache-scaling",
|
| - IDS_FLAGS_FONT_CACHE_SCALING_NAME,
|
| + {"enable-font-cache-scaling", IDS_FLAGS_FONT_CACHE_SCALING_NAME,
|
| IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll,
|
| FEATURE_VALUE_TYPE(features::kFontCacheScaling)},
|
|
|
|
|