diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 13:19:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 13:19:05 +0000 |
| commit | ad2a3ded81c49ee89b44f6b544d21ff617c935bf (patch) | |
| tree | e83f889f5b17ad81a5e177008df86a0ae9122e4d /chrome/browser/prefs | |
| parent | c0f2f52ebc9d7b41b79ea203a2cfae272c00b937 (diff) | |
| download | chromium_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/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 93bb6be..ea744ad 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -12,6 +12,7 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cookie_modal_dialog.h" #include "chrome/browser/debugger/devtools_manager.h" +#include "chrome/browser/dom_ui/labs_ui.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/dom_ui/plugins_ui.h" #include "chrome/browser/download/download_manager.h" @@ -26,6 +27,7 @@ #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/intranet_redirect_detector.h" +#include "chrome/browser/labs.h" #include "chrome/browser/metrics/metrics_log.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/chrome_url_request_context.h" @@ -113,6 +115,8 @@ void RegisterUserPrefs(PrefService* user_prefs) { TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); ExtensionDOMUI::RegisterUserPrefs(user_prefs); ExtensionsUI::RegisterUserPrefs(user_prefs); + if (about_labs::IsEnabled()) + LabsUI::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); PluginsUI::RegisterUserPrefs(user_prefs); HostContentSettingsMap::RegisterUserPrefs(user_prefs); |