Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 7f41b7f2bcae79c6519c8e376d453503e43fae94..f016253378a3672a715f37b533aee8b0cf63fa6c 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -189,13 +189,13 @@ const Experiment::Choice kNaClDebugMaskChoices[] = { |
#endif |
const Experiment::Choice kMarkNonSecureAsChoices[] = { |
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
- { IDS_MARK_NON_SECURE_AS_NEUTRAL, |
- switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNeutral}, |
- { IDS_MARK_NON_SECURE_AS_NON_SECURE, |
- switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNonSecure}, |
- { IDS_MARK_NON_SECURE_AS_DUBIOUS, |
- switches::kMarkNonSecureAs, switches::kMarkNonSecureAsDubious} |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
+ { IDS_MARK_NON_SECURE_AS_NEUTRAL, |
+ switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNeutral}, |
+ { IDS_MARK_NON_SECURE_AS_NON_SECURE, |
+ switches::kMarkNonSecureAs, switches::kMarkNonSecureAsNonSecure}, |
+ { IDS_MARK_NON_SECURE_AS_DUBIOUS, |
+ switches::kMarkNonSecureAs, switches::kMarkNonSecureAsDubious} |
}; |
const Experiment::Choice kMaxTilesForInterestAreaChoices[] = { |
@@ -308,19 +308,19 @@ const Experiment::Choice kEnableGpuRasterizationChoices[] = { |
#if defined(OS_CHROMEOS) |
const Experiment::Choice kMemoryPressureThresholdChoices[] = { |
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
- { IDS_FLAGS_CONSERVATIVE_THRESHOLDS, |
- chromeos::switches::kMemoryPressureThresholds, |
- chromeos::switches::kConservativeThreshold }, |
- { IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS, |
- chromeos::switches::kMemoryPressureThresholds, |
- chromeos::switches::kAggressiveCacheDiscardThreshold }, |
- { IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS, |
- chromeos::switches::kMemoryPressureThresholds, |
- chromeos::switches::kAggressiveTabDiscardThreshold }, |
- { IDS_FLAGS_AGGRESSIVE_THRESHOLDS, |
- chromeos::switches::kMemoryPressureThresholds, |
- chromeos::switches::kAggressiveThreshold }, |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
+ { IDS_FLAGS_CONSERVATIVE_THRESHOLDS, |
+ chromeos::switches::kMemoryPressureThresholds, |
+ chromeos::switches::kConservativeThreshold }, |
+ { IDS_FLAGS_AGGRESSIVE_CACHE_DISCARD_THRESHOLDS, |
+ chromeos::switches::kMemoryPressureThresholds, |
+ chromeos::switches::kAggressiveCacheDiscardThreshold }, |
+ { IDS_FLAGS_AGGRESSIVE_TAB_DISCARD_THRESHOLDS, |
+ chromeos::switches::kMemoryPressureThresholds, |
+ chromeos::switches::kAggressiveTabDiscardThreshold }, |
+ { IDS_FLAGS_AGGRESSIVE_THRESHOLDS, |
+ chromeos::switches::kMemoryPressureThresholds, |
+ chromeos::switches::kAggressiveThreshold }, |
}; |
#endif |
@@ -393,6 +393,19 @@ const Experiment::Choice kFillOnAccountSelectChoices[] = { |
autofill::switches::kEnableFillOnAccountSelectNoHighlighting, "" }, |
}; |
+#if defined(OS_CHROMEOS) |
+const Experiment::Choice kDataSaverPromptChoices[] = { |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
+ chromeos::switches::kDisableDataSaverPrompt, "" }, |
+ { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
+ chromeos::switches::kEnableDataSaverPrompt, "" }, |
+ { IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE, |
+ chromeos::switches::kEnableDataSaverPrompt, |
+ chromeos::switches::kDataSaverPromptDemoMode }, |
+}; |
+#endif |
+ |
// RECORDING USER METRICS FOR FLAGS: |
// ----------------------------------------------------------------------------- |
// The first line of the experiment is the internal name. If you'd like to |
@@ -2185,6 +2198,15 @@ const Experiment kExperiments[] = { |
switches::kSyncServiceURL, |
"https://chrome-sync.sandbox.google.com/chrome-sync/alpha") |
}, |
+#if defined(OS_CHROMEOS) |
+ { |
+ "enable-datasaver-prompt", |
+ IDS_FLAGS_DATASAVER_PROMPT_NAME, |
+ IDS_FLAGS_DATASAVER_PROMPT_DESCRIPTION, |
+ kOsCrOS, |
+ MULTI_VALUE_TYPE(kDataSaverPromptChoices) |
+ }, |
+#endif // defined(OS_CHROMEOS) |
// NOTE: Adding new command-line switches requires adding corresponding |
// entries to enum "LoginCustomFlags" in histograms.xml. See note in |