commit 9ce7cb4c378d6ac673abfd8c136960424f8308bb
author avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 07 18:53:07 2011
committer avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 07 18:53:07 2011
tree d9621a4f0527765cb42ed196becafd859b04ba22
parent 0dce842bb4d4b7d9f9816613c22aea947ed5b0fe

Make PerTabPrefsTabHelper into PrefsTabHelper, move all prefs code into it.

BUG=105872
TEST=no change

Review URL: http://codereview.chromium.org/8775064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113424 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 4e012821..ed999095 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -51,6 +51,7 @@
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
@@ -155,6 +156,7 @@
   DownloadPrefs::RegisterUserPrefs(user_prefs);
   bookmark_utils::RegisterUserPrefs(user_prefs);
   TabContentsWrapper::RegisterUserPrefs(user_prefs);
+  PrefsTabHelper::RegisterUserPrefs(user_prefs);
   TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
   ExtensionWebUI::RegisterUserPrefs(user_prefs);
   ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);