summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 13:19:05 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 13:19:05 +0000
commitad2a3ded81c49ee89b44f6b544d21ff617c935bf (patch)
treee83f889f5b17ad81a5e177008df86a0ae9122e4d /chrome/browser/browser_main.cc
parentc0f2f52ebc9d7b41b79ea203a2cfae272c00b937 (diff)
downloadchromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.zip
chromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.tar.gz
chromium_src-ad2a3ded81c49ee89b44f6b544d21ff617c935bf.tar.bz2
Implement about:labs
Tabpose is currently the only lab on mac, tabs-on-left the only lab on windows. Nothing for linux yet. BUG=53399 TEST=Go to about:labs. Should have one feature on windows and osx each, none on linux yet. about:labs should not be visible on the stable channel. Labs that were enabled on the dev channel should not be enabled on the stable channel. about:labs in chromeos should still work (they use a different implementation) Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57635 Review URL: http://codereview.chromium.org/3152055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 1c243e7..436de42 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -43,6 +43,7 @@
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/jankometer.h"
+#include "chrome/browser/labs.h"
#include "chrome/browser/metrics/histogram_synchronizer.h"
#include "chrome/browser/metrics/metrics_log.h"
#include "chrome/browser/metrics/metrics_service.h"
@@ -1182,6 +1183,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
PrefService* user_prefs = profile->GetPrefs();
DCHECK(user_prefs);
+ // Convert active labs into switches. Modifies the current command line.
+ about_labs::ConvertLabsToSwitches(profile, CommandLine::ForCurrentProcess());
+
// Tests should be able to tune login manager before showing it.
// Thus only show login manager in normal (non-testing) mode.
if (!parameters.ui_task) {