chrome/browser/chromeos/login/session/user_session_manager.cc - Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

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/chromeos/login/session/user_session_manager.cc

Issue 1610823003: Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix-add-supervised-user

Patch Set: Address comments Created 4 years, 11 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/user_selection_screen.cc ('k') | chrome/browser/chromeos/login/test/oobe_base_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.cc

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc

index 0a145993d8c347da68a2f27d5198852ce6fd6ee2..305ff991b57406d36c300ef3a286d0b1e4aa9475 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -42,6 +42,7 @@

#include "chrome/browser/chromeos/login/chrome_restart_request.h"

#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"

+#include "chrome/browser/chromeos/login/existing_user_controller.h"

#include "chrome/browser/chromeos/login/helper.h"

#include "chrome/browser/chromeos/login/lock/screen_locker.h"

#include "chrome/browser/chromeos/login/profile_auth_data.h"

@@ -53,7 +54,6 @@

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/login/ui/input_events_blocker.h"

#include "chrome/browser/chromeos/login/ui/login_display_host.h"

-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

#include "chrome/browser/chromeos/login/user_flow.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

@@ -1181,7 +1181,7 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {

}

void UserSessionManager::ActivateWizard(const std::string& screen_name) {

- LoginDisplayHost* host = LoginDisplayHostImpl::default_host();

+ LoginDisplayHost* host = LoginDisplayHost::default_host();

CHECK(host);

host->StartWizard(screen_name);

}

@@ -1271,7 +1271,7 @@ bool UserSessionManager::InitializeUserSession(Profile* profile) {

}

- DoBrowserLaunch(profile, LoginDisplayHostImpl::default_host());

+ DoBrowserLaunch(profile, LoginDisplayHost::default_host());

return true;

}