commit 295ca1a7df4aa0359b74036ce4ade8bde10e43b8
author nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 01 16:14:31 2014
committer nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 01 16:14:31 2014
tree 3f43e77a2cae12e8d5fb189a06c75e4faafe5108
parent d90f748a8d2115df3fd02f56d0f864b17164bba2

Rename SessionManager to UserSessionManager

SessionManager will be a new component that will be responsible on branching on startup:
* restart after crash
* start stub user session
* start out-of-box/login
* start kiosk session

Using UserSessionManager for now as a placeholder since most of that code will be moved later to smth like RegularUserSessionStarter (or RegularUserSessionDelegate).

Note: CL contains only file moves/class renames (+removed 2 unused headers).

BUG=370175
TBR=courage@chromium.org,bauerb@chromium.org

Review URL: https://codereview.chromium.org/365583002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280828 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 5505228..a1951cc3 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -149,7 +149,7 @@
 #include "chrome/browser/chromeos/first_run/first_run.h"
 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
-#include "chrome/browser/chromeos/login/session/session_manager.h"
+#include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
@@ -311,13 +311,13 @@
   chromeos::RegisterDisplayLocalStatePrefs(registry);
   chromeos::ResetScreenHandler::RegisterPrefs(registry);
   chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
-  chromeos::SessionManager::RegisterPrefs(registry);
   chromeos::SigninScreenHandler::RegisterPrefs(registry);
+  chromeos::StartupUtils::RegisterPrefs(registry);
   chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
   chromeos::UserImageManager::RegisterPrefs(registry);
   chromeos::UserManager::RegisterPrefs(registry);
+  chromeos::UserSessionManager::RegisterPrefs(registry);
   chromeos::WallpaperManager::RegisterPrefs(registry);
-  chromeos::StartupUtils::RegisterPrefs(registry);
   chromeos::echo_offer::RegisterPrefs(registry);
   extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
   invalidation::InvalidatorStorage::RegisterPrefs(registry);