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

Unified Diff: chrome/browser/chromeos/login/kiosk_browsertest.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/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 36875d7d5b760fd0e1eccd3b29a0d7994bc11245..2f581f992e272663edfad1a64818b7ab43a08410 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -13,8 +13,8 @@
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/login/webui_login_display_host.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
@@ -88,8 +88,8 @@ class TestBrowserMainExtraParts
LOG(INFO) << "NOTIFICATION_LOGIN_WEBUI_VISIBLE";
} else if (type == chrome::NOTIFICATION_KIOSK_APPS_LOADED) {
LOG(INFO) << "chrome::NOTIFICATION_KIOSK_APPS_LOADED";
- content::WebUI* web_ui = static_cast<chromeos::WebUILoginDisplayHost*>(
- chromeos::WebUILoginDisplayHost::default_host())->
+ content::WebUI* web_ui = static_cast<chromeos::LoginDisplayHostImpl*>(
+ chromeos::LoginDisplayHostImpl::default_host())->
GetOobeUI()->web_ui();
web_ui->CallJavascriptFunction("login.AppsMenuButton.runAppForTesting",
base::StringValue(kTestKioskApp));

Powered by Google App Engine
This is Rietveld 408576698