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

Unified Diff: chrome/browser/browser_main.cc

Issue 6267009: Move experiments settings (about:flags) from profile to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | « no previous file | chrome/browser/dom_ui/flags_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 72208)
+++ chrome/browser/browser_main.cc (working copy)
@@ -1244,6 +1244,10 @@
// Initialize the prefs of the local state.
browser::RegisterLocalState(local_state);
+ // Convert active labs into switches. Modifies the current command line.
+ about_flags::ConvertFlagsToSwitches(local_state,
+ CommandLine::ForCurrentProcess());
+
// Now that all preferences have been registered, set the install date
// for the uninstall metrics if this is our first run. This only actually
// gets used if the user has metrics reporting enabled at uninstall time.
@@ -1579,7 +1583,7 @@
HandleTestParameters(parsed_command_line);
RecordBreakpadStatusUMA(metrics);
- about_flags::RecordUMAStatistics(user_prefs);
+ about_flags::RecordUMAStatistics(local_state);
// Stat the directory with the inspector's files so that we can know if we
// should display the entry in the context menu or not.
« no previous file with comments | « no previous file | chrome/browser/dom_ui/flags_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698