chrome/browser/chromeos/login/ui/webui_login_display.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/ui/webui_login_display.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

« chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc ('K') | « chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/webui_login_display.cc

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

index 782ad0fcfaacb3b302044f343e1304020fe8f728..bd8d9cde1727c7a9b8bb50eb164991d538e0c257 100644

--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc

+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc

@@ -9,7 +9,7 @@

#include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"

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

#include "chrome/browser/chromeos/login/startup_utils.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/ui/user_adding_screen.h"

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

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

@@ -97,11 +97,9 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {

ClearAndEnablePassword();

}

- if (chromeos::LoginDisplayHost* host =

- chromeos::LoginDisplayHostImpl::default_host()) {

- if (chromeos::WebUILoginView* login_view = host->GetWebUILoginView())

- login_view->SetUIEnabled(is_enabled);

- }

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

+ if (host && host->GetWebUILoginView())

+ host->GetWebUILoginView()->SetUIEnabled(is_enabled);

}

void WebUILoginDisplay::ShowError(int error_msg_id,