commit a05c4e1277023acdfab0aa821ed06eca012f08d3
author rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jul 25 18:49:45 2011
committer rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jul 25 18:49:45 2011
tree a6a85a674ed88ddf52f464e882cb2ea0e36c46af
parent cdf7ac88bda7058661131cc3cceb36fdf5fd4ca0

Make changes to auto-login feature after feedback from Travis:

- add button to infobar allowing user to disable feature completely
- add checkbox to password section of personal settings allowing user to toggle
  whether auto-login is enabled
- some word changes to the infobar
- remove the about:flags option since we now have control in options

BUG=87151
TEST=Make sure that checkbox in options page controls feature correctly

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93926 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 4275cc6..bbb23f6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -51,6 +51,7 @@
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/task_manager/task_manager.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/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -137,6 +138,7 @@
   // User prefs
   AppsPromo::RegisterUserPrefs(user_prefs);
   AutofillManager::RegisterUserPrefs(user_prefs);
+  AutoLoginInfoBarDelegate::RegisterUserPrefs(user_prefs);
   SessionStartupPref::RegisterUserPrefs(user_prefs);
   BookmarkModel::RegisterUserPrefs(user_prefs);
   Browser::RegisterUserPrefs(user_prefs);