| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 83bc462cb04ad2d0c7d1d4a39c7ac4b85a72b88b..3a40535be3c2181e918087f90c0f65e79803d753 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
|
|
| +#include "chrome/browser/about_flags.h"
|
| #include "chrome/browser/autofill/autofill_manager.h"
|
| #include "chrome/browser/background_contents_service.h"
|
| #include "chrome/browser/background_mode_manager.h"
|
| @@ -11,7 +12,7 @@
|
| #include "chrome/browser/browser.h"
|
| #include "chrome/browser/browser_shutdown.h"
|
| #include "chrome/browser/debugger/devtools_manager.h"
|
| -#include "chrome/browser/dom_ui/labs_ui.h"
|
| +#include "chrome/browser/dom_ui/flags_ui.h"
|
| #include "chrome/browser/dom_ui/new_tab_ui.h"
|
| #include "chrome/browser/dom_ui/plugins_ui.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| @@ -26,7 +27,6 @@
|
| #include "chrome/browser/host_zoom_map.h"
|
| #include "chrome/browser/intranet_redirect_detector.h"
|
| #include "chrome/browser/instant/instant_controller.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"
|
| @@ -119,8 +119,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);
|
| + if (about_flags::IsEnabled())
|
| + FlagsUI::RegisterUserPrefs(user_prefs);
|
| NewTabUI::RegisterUserPrefs(user_prefs);
|
| PluginsUI::RegisterUserPrefs(user_prefs);
|
| ProfileImpl::RegisterUserPrefs(user_prefs);
|
|
|