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

Unified Diff: chrome/browser/about_flags.cc

Issue 1668523002: [Password Manager] Switch password manager code to use the Feature framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes to fieldtrial_testing_config_*.json Created 4 years, 10 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
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a9514540bc641086b9f71f7cd62dc45a52066914..5d34e3c64e33f61f8195707d9ba3ce808af9c5bd 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -45,7 +45,6 @@
#include "components/offline_pages/offline_page_switches.h"
#include "components/omnibox/browser/omnibox_switches.h"
#include "components/password_manager/core/common/password_manager_features.h"
-#include "components/password_manager/core/common/password_manager_switches.h"
#include "components/proximity_auth/switches.h"
#include "components/search/search_switches.h"
#include "components/security_state/switches.h"
@@ -359,16 +358,6 @@ const FeatureEntry::Choice kExtensionContentVerificationChoices[] = {
switches::kExtensionContentVerificationEnforceStrict },
};
-const FeatureEntry::Choice kAutofillSyncCredentialChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
- { IDS_ALLOW_AUTOFILL_SYNC_CREDENTIAL,
- password_manager::switches::kAllowAutofillSyncCredential, ""},
- { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL_FOR_REAUTH,
- password_manager::switches::kDisallowAutofillSyncCredentialForReauth, ""},
- { IDS_DISALLOW_AUTOFILL_SYNC_CREDENTIAL,
- password_manager::switches::kDisallowAutofillSyncCredential, ""},
-};
-
const FeatureEntry::Choice kFillOnAccountSelectChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
@@ -936,9 +925,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME,
IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION,
kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
- ENABLE_DISABLE_VALUE_TYPE(
- password_manager::switches::kEnableAffiliationBasedMatching,
- password_manager::switches::kDisableAffiliationBasedMatching)},
+ 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,
ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
@@ -1301,10 +1288,8 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop,
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow,
switches::kDisableSettingsWindow)},
- {"inert-visual-viewport",
- IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME,
- IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION,
- kOsAll,
+ {"inert-visual-viewport", IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME,
+ IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kInertVisualViewport)},
#if defined(OS_MACOSX)
{"enable-save-password-bubble", IDS_FLAGS_SAVE_PASSWORD_BUBBLE_NAME,
@@ -1362,18 +1347,13 @@ const FeatureEntry kFeatureEntries[] = {
#endif
{"enable-drop-sync-credential", IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
- ENABLE_DISABLE_VALUE_TYPE(
- password_manager::switches::kEnableDropSyncCredential,
- password_manager::switches::kDisableDropSyncCredential)},
+ FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
#if defined(ENABLE_EXTENSIONS)
{"enable-extension-action-redesign",
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)},
#endif
- {"autofill-sync-credential", IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME,
- IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
- MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)},
#if !defined(OS_ANDROID)
{"enable-message-center-always-scroll-up-upon-notification-removal",
IDS_FLAGS_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME,
@@ -1712,8 +1692,7 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kEnableTabSwitcherInDocumentMode)},
#endif // OS_ANDROID
{"enable-md-history", IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_NAME,
- IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION,
- kOsDesktop,
+ IDS_FLAGS_ENABLE_MATERIAL_DESIGN_HISTORY_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignHistory)},
#if defined(OS_WIN)
{"enable-windows-desktop-search-redirection",
@@ -1790,9 +1769,8 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kScrollAnchoring)},
{"disable-compositor-animation-timelines",
IDS_FLAGS_DISABLE_COMPOSITOR_ANIMATION_TIMELINES,
- IDS_FLAGS_DISABLE_COMPOSITOR_ANIMATION_TIMELINES_DESCRIPTION,
- kOsAll, SINGLE_DISABLE_VALUE_TYPE(
- switches::kDisableCompositorAnimationTimelines)},
+ IDS_FLAGS_DISABLE_COMPOSITOR_ANIMATION_TIMELINES_DESCRIPTION, kOsAll,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableCompositorAnimationTimelines)},
#if !defined(OS_ANDROID)
{"ui-disable-compositor-animation-timelines",
IDS_FLAGS_DISABLE_UI_COMPOSITOR_ANIMATION_TIMELINES,
@@ -1802,19 +1780,26 @@ const FeatureEntry kFeatureEntries[] = {
#endif // !defined(OS_ANDROID)
{"enable-audio-support-for-desktop-share",
IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE,
- IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION,
- kOsAll,
+ IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)},
#if defined(ENABLE_EXTENSIONS)
{"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE,
IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
- SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)}
+ SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)},
#endif
#if defined(OS_ANDROID)
{"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
#endif // defined(OS_ANDROID)
+ {"enable-protect-sync-credential", IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_NAME,
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
+ FEATURE_VALUE_TYPE(password_manager::features::kProtectSyncCredential)},
+ {"enable-protect-sync-credential-on-reauth",
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME,
+ IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll,
+ FEATURE_VALUE_TYPE(
+ password_manager::features::kProtectSyncCredentialOnReauth)},
// NOTE: Adding new command-line switches requires adding corresponding
// entries to enum "LoginCustomFlags" in histograms.xml. See note in
// histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.

Powered by Google App Engine
This is Rietveld 408576698