Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: chrome/browser/about_flags.cc

Issue 2029263002: [MD Settings] Add feature to enable md-settings by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix URL CHECK statement. (Use URL, not Host) Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index bade77bbbbdbc638c3d3e844ddcaa616d10b56dd..eea37595bf9e9d6a6afa14cfc371911fb3a14518 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -714,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,
@@ -940,8 +939,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",
@@ -963,8 +961,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,
@@ -986,9 +983,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,
@@ -1008,8 +1004,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)},
@@ -1024,8 +1019,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,
@@ -1158,13 +1152,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",
@@ -1284,8 +1276,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)},
@@ -1322,8 +1313,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,
@@ -1505,8 +1495,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)
@@ -1548,8 +1537,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",
@@ -1702,8 +1690,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)},
@@ -1727,6 +1714,9 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop,
FEATURE_VALUE_TYPE(features::kMaterialDesignHistoryFeature)},
+ {"enable-md-settings", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME,
+ IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_DESCRIPTION, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kMaterialDesignSettingsFeature)},
{"safe-search-url-reporting", IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_NAME,
IDS_FLAGS_SAFE_SEARCH_URL_REPORTING_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(features::kSafeSearchUrlReporting)},
@@ -1911,8 +1901,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)},
#if defined(OS_ANDROID)
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698