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

Unified Diff: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.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/ui/webui/chromeos/mobile_setup_dialog.cc
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
index 841564178c6b6ded6577d378989c713e0e516d46..5acf8dfdf5b09a8f0a1e623b0b595f419e4d5c40 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
@@ -8,7 +8,7 @@
#include "base/memory/singleton.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_shutdown.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/login/webui_login_view.h"
#include "chrome/browser/chromeos/mobile/mobile_activator.h"
#include "chrome/browser/platform_util.h"
@@ -99,11 +99,11 @@ void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) {
gfx::NativeWindow parent = NULL;
// If we're on the login screen.
- 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::LoginDisplayHostImpl* webui_host =
+ static_cast<chromeos::LoginDisplayHostImpl*>(
+ chromeos::LoginDisplayHostImpl::default_host());
+ chromeos::WebUILoginView* login_view = webui_host->GetWebUILoginView();
if (login_view)
parent = login_view->GetNativeWindow();
}
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698