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

Unified Diff: chrome/browser/chromeos/login/webui_login_display.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/login/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index bd6f2b0355b78b4f4e2a743fcbfa294a9ee50486..3658916351a263dcb69f66fbdec8f9f22b75cde1 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -8,9 +8,9 @@
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/wallpaper_manager.h"
-#include "chrome/browser/chromeos/login/webui_login_display_host.h"
#include "chrome/browser/chromeos/login/webui_login_view.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser_window.h"
@@ -110,11 +110,10 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
webui_handler_->ClearAndEnablePassword();
}
- if (chromeos::WebUILoginDisplayHost::default_host()) {
- chromeos::WebUILoginDisplayHost* webui_host =
- static_cast<chromeos::WebUILoginDisplayHost*>(
- chromeos::WebUILoginDisplayHost::default_host());
- chromeos::WebUILoginView* login_view = webui_host->login_view();
+ if (chromeos::LoginDisplayHostImpl::default_host()) {
+ chromeos::LoginDisplayHost* host =
+ chromeos::LoginDisplayHostImpl::default_host();
+ chromeos::WebUILoginView* login_view = host->GetWebUILoginView();
if (login_view)
login_view->SetUIEnabled(is_enabled);
}
« no previous file with comments | « chrome/browser/chromeos/login/mock_login_display_host.cc ('k') | chrome/browser/chromeos/login/webui_login_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698