chrome/browser/ui/webui/chromeos/login/base_screen_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/base_screen_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: 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

« chrome/browser/chromeos/system/device_disabling_browsertest.cc ('K') | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c0d0c7530341062eef427797c0fdc74be42c39d3..d5dd12ef109e85aa586a0b4dee859c93b0931f25 100644

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

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

@@ -6,7 +6,8 @@

#include "base/logging.h"

#include "base/values.h"

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

+#include "chrome/browser/chromeos/login/screens/base_screen.h"

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

#include "components/login/localized_values_builder.h"

#include "content/public/browser/web_ui.h"

#include "ui/base/l10n/l10n_util.h"

@@ -81,7 +82,7 @@ void BaseScreenHandler::ShowScreen(const char* screen_name,

}

gfx::NativeWindow BaseScreenHandler::GetNativeWindow() {

- return LoginDisplayHostImpl::default_host()->GetNativeWindow();

+ return LoginDisplayHost::default_host()->GetNativeWindow();

}

void BaseScreenHandler::SetBaseScreen(BaseScreen* base_screen) {