chrome/browser/prefs/browser_prefs.cc - Issue 318853004: Introduce SessionManager that will contain code to start user session on Chrome OS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 318853004: Introduce SessionManager that will contain code to start user session on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/session/session_manager.h ('K') | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 9a241528b7393d0c64cba23426b73d5804d64dad..41cb2e42e75d40007dc6ae3bb976c84c7a3ecc76 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -144,8 +144,8 @@

#include "chrome/browser/chromeos/file_system_provider/service.h"

#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/login_utils.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/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"

@@ -170,6 +170,7 @@

#include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"

+#include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#else

#include "chrome/browser/extensions/default_apps.h"

@@ -296,13 +297,14 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);

chromeos::language_prefs::RegisterPrefs(registry);

chromeos::KioskAppManager::RegisterPrefs(registry);

- chromeos::LoginUtils::RegisterPrefs(registry);

+ chromeos::SessionManager::RegisterPrefs(registry);

Bernhard Bauer 2014/06/11 15:17:09 Move this down so it will stay sorted?

chromeos::MultiProfileUserController::RegisterPrefs(registry);

chromeos::HIDDetectionScreenHandler::RegisterPrefs(registry);

chromeos::NetworkScreenHandler::RegisterPrefs(registry);

chromeos::Preferences::RegisterPrefs(registry);

chromeos::proxy_config::RegisterPrefs(registry);

chromeos::RegisterDisplayLocalStatePrefs(registry);

+ chromeos::ResetScreenHandler::RegisterPrefs(registry);

chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);

chromeos::SigninScreenHandler::RegisterPrefs(registry);

chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);