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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/about_flags.cc

Issue 2773323002: Make flags resources naming consistent (Closed)
Patch Set: Fix Android Created 3 years, 9 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/google_chrome_strings.grd ('k') | no next file » | 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 b3053a69232082c415dc1f7ab3e23d7b6a73405b..9e07aab99565dad319f056ae719b88866f574a54 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -160,64 +160,54 @@ const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
#if defined(USE_AURA)
const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kOverscrollHistoryNavigation,
- "0" },
- { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
- switches::kOverscrollHistoryNavigation,
- "2" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", ""},
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+ switches::kOverscrollHistoryNavigation, "0"},
+ {IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
+ switches::kOverscrollHistoryNavigation, "2"}};
const FeatureEntry::Choice kOverscrollStartThresholdChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_OVERSCROLL_START_THRESHOLD_133_PERCENT,
- switches::kOverscrollStartThreshold,
- "133" },
- { IDS_OVERSCROLL_START_THRESHOLD_166_PERCENT,
- switches::kOverscrollStartThreshold,
- "166" },
- { IDS_OVERSCROLL_START_THRESHOLD_200_PERCENT,
- switches::kOverscrollStartThreshold,
- "200" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_133_PERCENT,
+ switches::kOverscrollStartThreshold, "133"},
+ {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_166_PERCENT,
+ switches::kOverscrollStartThreshold, "166"},
+ {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_200_PERCENT,
+ switches::kOverscrollStartThreshold, "200"}};
#endif // USE_AURA
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_TOUCH_SELECTION_STRATEGY_CHARACTER,
- switches::kTouchTextSelectionStrategy,
- "character" },
- { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION,
- switches::kTouchTextSelectionStrategy,
- "direction" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+ {IDS_FLAGS_TOUCH_SELECTION_STRATEGY_CHARACTER,
+ switches::kTouchTextSelectionStrategy, "character"},
+ {IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DIRECTION,
+ switches::kTouchTextSelectionStrategy, "direction"}};
const FeatureEntry::Choice kTraceUploadURL[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", "" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,Other"},
- { IDS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,emloading" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,QA" },
- { IDS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
- "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam" }
-};
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", ""},
+ {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,Other"},
+ {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,emloading"},
+ {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,QA"},
+ {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
+ "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}};
#if !defined(DISABLE_NACL)
const FeatureEntry::Choice kNaClDebugMaskChoices[] = {
- // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
- // debug stub to a remote machine. Since secure shell uses NaCl, we usually
- // want to avoid debugging that. The PNaCl translator is also a NaCl module,
- // so by default we want to avoid debugging that.
- // NOTE: As the default value must be the empty string, the mask excluding
- // the PNaCl translator and secure shell is substituted elsewhere.
- { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
- { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" },
- { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
- switches::kNaClDebugMask, "*://*/*debug.nmf" }
-};
+ // Secure shell can be used on ChromeOS for forwarding the TCP port opened
+ // by
+ // debug stub to a remote machine. Since secure shell uses NaCl, we usually
+ // want to avoid debugging that. The PNaCl translator is also a NaCl module,
+ // so by default we want to avoid debugging that.
+ // NOTE: As the default value must be the empty string, the mask excluding
+ // the PNaCl translator and secure shell is substituted elsewhere.
+ {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", ""},
+ {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask,
+ "*://*"},
+ {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, switches::kNaClDebugMask,
+ "*://*/*debug.nmf"}};
#endif // DISABLE_NACL
const FeatureEntry::Choice kPassiveListenersChoices[] = {
@@ -230,7 +220,7 @@ const FeatureEntry::Choice kPassiveListenersChoices[] = {
const FeatureEntry::Choice kMarkHttpAsChoices[] = {
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
- {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs,
+ {IDS_FLAGS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs,
security_state::switches::kMarkHttpAsDangerous}};
const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = {
@@ -997,8 +987,8 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_DESCRIPTION, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kSilentDebuggerExtensionAPI)},
#if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_ANDROID)
- {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK,
- IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid,
+ {"enable-android-spellchecker", IDS_FLAGS_ENABLE_ANDROID_SPELLCHECKER_NAME,
+ IDS_FLAGS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellCheckerNonLowEnd)},
#endif // ENABLE_SPELLCHECK && OS_ANDROID
{"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME,
@@ -1429,8 +1419,8 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
#if defined(OS_MACOSX)
- {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG,
- IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
+ {"enable-native-notifications", IDS_FLAGS_NOTIFICATIONS_NATIVE_FLAG,
+ IDS_FLAGS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
FEATURE_VALUE_TYPE(features::kNativeNotifications)},
#endif // OS_MACOSX
#if defined(TOOLKIT_VIEWS)
@@ -1579,10 +1569,11 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)},
#endif // OS_CHROMEOS
- {"mark-non-secure-as", IDS_MARK_HTTP_AS_NAME, IDS_MARK_HTTP_AS_DESCRIPTION,
- kOsAll, MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
- {"enable-http-form-warning", IDS_ENABLE_HTTP_FORM_WARNING_NAME,
- IDS_ENABLE_HTTP_FORM_WARNING_DESCRIPTION, kOsAll,
+ {"mark-non-secure-as", IDS_FLAGS_MARK_HTTP_AS_NAME,
+ IDS_FLAGS_MARK_HTTP_AS_DESCRIPTION, kOsAll,
+ MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
+ {"enable-http-form-warning", IDS_FLAGS_ENABLE_HTTP_FORM_WARNING_NAME,
+ IDS_FLAGS_ENABLE_HTTP_FORM_WARNING_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(security_state::kHttpFormWarningFeature)},
{"enable-site-per-process", IDS_FLAGS_SITE_PER_PROCESS_NAME,
IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, kOsAll,
@@ -1614,8 +1605,8 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
kEnableDataReductionProxySavingsPromo)},
#endif // OS_ANDROID
- {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST,
- IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
+ {"allow-insecure-localhost", IDS_FLAGS_ALLOW_INSECURE_LOCALHOST,
+ IDS_FLAGS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)},
{"enable-add-to-shelf", IDS_FLAGS_ADD_TO_SHELF_NAME,
IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, kOsDesktop,
@@ -1915,12 +1906,12 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_SCROLL_ANCHORING_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(features::kScrollAnchoring)},
{"disable-audio-support-for-desktop-share",
- IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
- IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
+ IDS_FLAGS_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
+ IDS_FLAGS_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
#if BUILDFLAG(ENABLE_EXTENSIONS)
- {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
- IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
+ {"tab-for-desktop-share", IDS_FLAGS_DISABLE_TAB_FOR_DESKTOP_SHARE,
+ IDS_FLAGS_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
SINGLE_VALUE_TYPE(extensions::switches::kDisableTabForDesktopShare)},
#endif // ENABLE_EXTENSIONS
#if defined(OS_ANDROID)
@@ -2121,17 +2112,17 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)},
#endif // OS_CHROMEOS
- {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME,
- IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll,
+ {"fill-on-account-select", IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_NAME,
+ IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)},
{"new-audio-rendering-mixing-strategy",
- IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME,
- IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION,
+ IDS_FLAGS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME,
+ IDS_FLAGS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION,
kOsWin | kOsMac | kOsLinux | kOsAndroid,
FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
{"disable-background-video-track",
- IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
- IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
+ IDS_FLAGS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
+ IDS_FLAGS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
#if defined(OS_CHROMEOS)
{"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
@@ -2277,8 +2268,8 @@ const FeatureEntry kFeatureEntries[] = {
autofill::kAutofillCreditCardPopupLayout,
kAutofillCreditCardPopupLayoutFeatureVariations,
"AutofillCreditCardPopupLayout")},
- {"native-android-history-manager", IDS_NATIVE_ANDROID_HISTORY_MANAGER,
- IDS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid,
+ {"native-android-history-manager", IDS_FLAGS_NATIVE_ANDROID_HISTORY_MANAGER,
+ IDS_FLAGS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(features::kNativeAndroidHistoryManager)},
#endif // OS_ANDROID
{"enable-autofill-credit-card-last-used-date-display",
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698