diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:09:14 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:09:14 +0000 |
| commit | 25b620761a89f0168b1226b1e40417fc43a550ba (patch) | |
| tree | 80538fba145a4e9999db7a51e6f3e28cd6910cdf | |
| parent | 64dd4127df1ff3add637330ef02f26b35fa77ca3 (diff) | |
| download | chromium_src-25b620761a89f0168b1226b1e40417fc43a550ba.zip chromium_src-25b620761a89f0168b1226b1e40417fc43a550ba.tar.gz chromium_src-25b620761a89f0168b1226b1e40417fc43a550ba.tar.bz2 | |
Cleanup: Remove an unused variable.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8651005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112510 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/user_manager.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/defaults.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/defaults.h | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index b5785f6..6f3737b 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -4,13 +4,14 @@ #include "chrome/browser/chromeos/login/user_manager.h" +#include <vector> + #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/lazy_instance.h" -#include "base/location.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" @@ -34,7 +35,6 @@ #include "chrome/browser/chromeos/login/ownership_service.h" #include "chrome/browser/chromeos/system/runtime_environment.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" -#include "chrome/browser/defaults.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile_downloader.h" @@ -265,7 +265,6 @@ void UserManager::UserLoggedIn(const std::string& email) { if (logged_in_user == users_.end()) { current_user_is_new_ = true; - browser_defaults::skip_restore = true; logged_in_user_ = CreateUser(email); } else { logged_in_user_ = *logged_in_user; diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc index 2866385..1f3e303 100644 --- a/chrome/browser/defaults.cc +++ b/chrome/browser/defaults.cc @@ -88,8 +88,6 @@ const int kInfoBarBorderPaddingVertical = 5; bool bookmarks_enabled = true; -bool skip_restore = false; - bool enable_help_app = true; } // namespace browser_defaults diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h index 1731806..e06f008 100644 --- a/chrome/browser/defaults.h +++ b/chrome/browser/defaults.h @@ -87,9 +87,6 @@ extern const int kInfoBarBorderPaddingVertical; // Are bookmark enabled? True by default. extern bool bookmarks_enabled; -// Should we skip the user's preference for restore. False by default. -extern bool skip_restore; - // Whether HelpApp is enabled. True by default. This is only used by Chrome OS // today. extern bool enable_help_app; |