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

Unified Diff: chrome/browser/browser_main.cc

Issue 6961015: Convert active labs into switches earlier. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 8d3bc3783d4162055e02479e5b6659708cbf636a..0e35e866d281f68ff6ed93a5dfe66404ce48aa15 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1384,6 +1384,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs))
WarnAboutMinimumSystemRequirements();
+ // Convert active labs into switches. Modifies the current command line.
+ about_flags::ConvertFlagsToSwitches(local_state,
+ CommandLine::ForCurrentProcess());
+
InitializeNetworkOptions(parsed_command_line);
// Initialize histogram synchronizer system. This is a singleton and is used
@@ -1398,10 +1402,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
// watched.
scoped_ptr<ThreadWatcherList> thread_watcher_list(new ThreadWatcherList());
- // Convert active labs into switches. Modifies the current command line.
- about_flags::ConvertFlagsToSwitches(local_state,
- CommandLine::ForCurrentProcess());
-
// Now the command line has been mutated based on about:flags, we can
// set up metrics and initialize field trials.
MetricsService* metrics = parts->SetupMetricsAndFieldTrials(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698