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

Unified Diff: chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 5 years, 10 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/ui/captive_portal_window_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
index e60b2a709d4c27f6ab547068f278f73524320910..50432bd7a11bb0ba49737ce36936be785a7fac39 100644
--- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
@@ -7,6 +7,8 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/login/login_manager_test.h"
+#include "chrome/browser/chromeos/login/screens/error_screen.h"
+#include "chrome/browser/chromeos/login/screens/network_error_view.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
#include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
@@ -216,18 +218,18 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, OpenPortalDialog) {
ASSERT_TRUE(host);
OobeUI* oobe = host->GetOobeUI();
ASSERT_TRUE(oobe);
- ErrorScreenActor* actor = oobe->GetErrorScreenActor();
- ASSERT_TRUE(actor);
+ NetworkErrorView* network_error_view = oobe->GetNetworkErrorView();
+ ASSERT_TRUE(network_error_view);
// Error screen asks portal detector to change detection strategy.
- ErrorScreen error_screen(NULL, actor);
+ ErrorScreen error_screen(NULL, network_error_view);
ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());
network_portal_detector()->NotifyObserversForTesting();
OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());
- actor->ShowCaptivePortal();
+ error_screen.ShowCaptivePortal();
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698