Commit f6f7a1fa authored by qsr@google.com's avatar qsr@google.com

Move preferences registering to backend.


BUG=none
TEST=none


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95597 0039d316-1c4b-4281-b951-d872f2087c98
parent 3c757f58
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/pinned_tab_codec.h"
#include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/ui/autologin_infobar_delegate.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/search_engines/keyword_editor_controller.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/tab_contents/tab_contents_wrapper.h"
...@@ -144,7 +143,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { ...@@ -144,7 +143,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
// User prefs // User prefs
AppsPromo::RegisterUserPrefs(user_prefs); AppsPromo::RegisterUserPrefs(user_prefs);
AutofillManager::RegisterUserPrefs(user_prefs); AutofillManager::RegisterUserPrefs(user_prefs);
AutoLoginInfoBarDelegate::RegisterUserPrefs(user_prefs);
SessionStartupPref::RegisterUserPrefs(user_prefs); SessionStartupPref::RegisterUserPrefs(user_prefs);
BookmarkModel::RegisterUserPrefs(user_prefs); BookmarkModel::RegisterUserPrefs(user_prefs);
Browser::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs);
......
...@@ -28,6 +28,9 @@ void SigninManager::RegisterUserPrefs(PrefService* user_prefs) { ...@@ -28,6 +28,9 @@ void SigninManager::RegisterUserPrefs(PrefService* user_prefs) {
user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername, user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername,
"", "",
PrefService::UNSYNCABLE_PREF); PrefService::UNSYNCABLE_PREF);
user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled,
true,
PrefService::UNSYNCABLE_PREF);
} }
void SigninManager::Initialize(Profile* profile) { void SigninManager::Initialize(Profile* profile) {
......
...@@ -133,12 +133,6 @@ void AutoLoginRedirector::RedirectToTokenAuth(const std::string& token) { ...@@ -133,12 +133,6 @@ void AutoLoginRedirector::RedirectToTokenAuth(const std::string& token) {
GURL(), PageTransition::AUTO_BOOKMARK); GURL(), PageTransition::AUTO_BOOKMARK);
} }
// static
void AutoLoginInfoBarDelegate::RegisterUserPrefs(PrefService* user_prefs) {
user_prefs->RegisterBooleanPref(prefs::kAutologinEnabled, true,
PrefService::UNSYNCABLE_PREF);
}
// static // static
void AutoLoginInfoBarDelegate::ShowIfAutoLoginRequested( void AutoLoginInfoBarDelegate::ShowIfAutoLoginRequested(
net::URLRequest* request, net::URLRequest* request,
......
...@@ -28,9 +28,6 @@ class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate, ...@@ -28,9 +28,6 @@ class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate,
virtual ~AutoLoginInfoBarDelegate(); virtual ~AutoLoginInfoBarDelegate();
// Register preferences used by auto-login feature.
static void RegisterUserPrefs(PrefService* user_prefs);
// Looks for the X-Auto-Login response header in the request, and if found, // Looks for the X-Auto-Login response header in the request, and if found,
// displays an infobar in the tab contents identified by the child/route id // displays an infobar in the tab contents identified by the child/route id
// if possible. // if possible.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment