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

Unified Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge + move method definition Created 7 years, 8 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/kiosk_mode/kiosk_mode_screensaver.cc
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 46c01dd37d44b57f851626d2c1f374a47d18d1c0..1bf21afe41738035fb3e22ef3be3480be003ece0 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/webui_login_display_host.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/policy/app_pack_updater.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
@@ -235,10 +235,10 @@ void KioskModeScreensaver::OnUserActivity() {
ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
// Find the retail mode login page.
- if (WebUILoginDisplayHost::default_host()) {
- WebUILoginDisplayHost* webui_host =
- static_cast<WebUILoginDisplayHost*>(
- WebUILoginDisplayHost::default_host());
+ if (LoginDisplayHostImpl::default_host()) {
+ LoginDisplayHostImpl* webui_host =
+ static_cast<LoginDisplayHostImpl*>(
+ LoginDisplayHostImpl::default_host());
OobeUI* oobe_ui = webui_host->GetOobeUI();
// Show the login spinner.

Powered by Google App Engine
This is Rietveld 408576698