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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 2642823011: cros: Fold NetworkErrorModel into NetworkErrorView. (Closed)
Patch Set: Address comments Created 3 years, 11 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/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 7dc1f89acf917192b190d6ec3e387c188b6603f1..128faa2d02b54c3c531ca6fc8dd6d66366814c82 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -279,10 +279,10 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
network_dropdown_handler_->AddObserver(error_screen_handler_);
error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_));
- NetworkErrorModel* network_error_model = error_screen_.get();
+ ErrorScreen* error_screen = error_screen_.get();
auto enrollment_screen_handler = base::MakeUnique<EnrollmentScreenHandler>(
- network_state_informer_, network_error_model);
+ network_state_informer_, error_screen);
enrollment_screen_actor_ = enrollment_screen_handler.get();
AddScreenHandler(std::move(enrollment_screen_handler));
@@ -311,14 +311,14 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
AddScreenHandler(std::move(gaia_screen_handler));
auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>(
- network_state_informer_, network_error_model, core_handler_,
+ network_state_informer_, error_screen, core_handler_,
gaia_screen_handler_);
signin_screen_handler_ = signin_screen_handler.get();
AddScreenHandler(std::move(signin_screen_handler));
auto app_launch_splash_screen_handler =
base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_,
- network_error_model);
+ error_screen);
app_launch_splash_screen_actor_ = app_launch_splash_screen_handler.get();
AddScreenHandler(std::move(app_launch_splash_screen_handler));

Powered by Google App Engine
This is Rietveld 408576698