| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 5526d53de380bf91b5a604beb4e173ad3e2fbf87..93bb6bea8e0f421caae9c1f24e479f840a4652e8 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -12,7 +12,6 @@
|
| #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"
|
| @@ -27,7 +26,6 @@
|
| #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"
|
| @@ -115,10 +113,8 @@ void RegisterUserPrefs(PrefService* user_prefs) {
|
| TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
|
| ExtensionDOMUI::RegisterUserPrefs(user_prefs);
|
| ExtensionsUI::RegisterUserPrefs(user_prefs);
|
| - LabsUI::RegisterUserPrefs(user_prefs);
|
| NewTabUI::RegisterUserPrefs(user_prefs);
|
| - if (about_labs::IsEnabled())
|
| - PluginsUI::RegisterUserPrefs(user_prefs);
|
| + PluginsUI::RegisterUserPrefs(user_prefs);
|
| HostContentSettingsMap::RegisterUserPrefs(user_prefs);
|
| HostZoomMap::RegisterUserPrefs(user_prefs);
|
| DevToolsManager::RegisterUserPrefs(user_prefs);
|
|
|