chrome/browser/ui/webui/chromeos/login/core_oobe_handler.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/ui/webui/chromeos/login/core_oobe_handler.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/ui/webui/chromeos/login/base_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

index 4d2d134429694736b955b8f4d498776217b33ffb..7aa2886bcdd32979bd002ee488dd1d9dabd7d028 100644

--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -12,7 +12,7 @@

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

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

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

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

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

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

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

@@ -172,11 +172,9 @@ void CoreOobeHandler::ShowDeviceResetScreen() {

if (wizard_controller && !wizard_controller->login_screen_started()) {

wizard_controller->AdvanceToScreen(WizardController::kResetScreenName);

} else {

- DCHECK(LoginDisplayHostImpl::default_host());

- if (LoginDisplayHostImpl::default_host()) {

- LoginDisplayHostImpl::default_host()->StartWizard(

- WizardController::kResetScreenName);

- }

+ DCHECK(LoginDisplayHost::default_host());

+ LoginDisplayHost::default_host()->StartWizard(

+ WizardController::kResetScreenName);

}

@@ -419,7 +417,7 @@ void CoreOobeHandler::HandleLaunchHelpApp(double help_topic_id) {

}

void CoreOobeHandler::HandleHeaderBarVisible() {

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

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

if (login_display_host)

login_display_host->SetStatusAreaVisible(true);

if (ScreenLocker::default_screen_locker())