Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(859)

Unified Diff: chrome/browser/chromeos/login/screens/error_screen.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
Index: chrome/browser/chromeos/login/screens/error_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/error_screen.cc b/chrome/browser/chromeos/login/screens/error_screen.cc
index fa900f93dcd8c120022da80d8adbe8349a3e2a8a..cfc1d3989521fdf192625dbd9f8ebc2f8801079c 100644
--- a/chrome/browser/chromeos/login/screens/error_screen.cc
+++ b/chrome/browser/chromeos/login/screens/error_screen.cc
@@ -11,12 +11,13 @@
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
#include "chrome/browser/chromeos/login/chrome_restart_request.h"
#include "chrome/browser/chromeos/login/screens/network_error_view.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.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/webui_login_view.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -146,9 +147,8 @@ void ErrorScreen::AllowOfflineLogin(bool allowed) {
void ErrorScreen::FixCaptivePortal() {
if (!captive_portal_window_proxy_.get()) {
- content::WebContents* web_contents = LoginDisplayHostImpl::default_host()
- ->GetWebUILoginView()
- ->GetWebContents();
+ content::WebContents* web_contents =
+ LoginDisplayHost::default_host()->GetWebUILoginView()->GetWebContents();
captive_portal_window_proxy_.reset(new CaptivePortalWindowProxy(
network_state_informer_.get(), web_contents));
}
@@ -260,7 +260,7 @@ void ErrorScreen::DefaultHideCallback() {
void ErrorScreen::OnConfigureCerts() {
gfx::NativeWindow native_window =
- LoginDisplayHostImpl::default_host()->GetNativeWindow();
+ LoginDisplayHost::default_host()->GetNativeWindow();
CertificateManagerDialog* dialog = new CertificateManagerDialog(
GetAppProfile(), NULL, native_window);
dialog->Show();
@@ -284,7 +284,7 @@ void ErrorScreen::OnDiagnoseButtonClicked() {
user_manager::UserManager::Get()->SessionStarted();
- LoginDisplayHostImpl::default_host()->Finalize();
+ LoginDisplayHost::default_host()->Finalize();
}
void ErrorScreen::OnLaunchOobeGuestSession() {
« no previous file with comments | « chrome/browser/chromeos/login/proxy_auth_dialog_browsertest.cc ('k') | chrome/browser/chromeos/login/screens/reset_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698