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 3115e01b0e93d2d3d4b68a50aa799cb2b5c2ed69..ccb2851e4d74ab1038df21a3540a5b3315b08c7c 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
@@ -290,18 +290,8 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) |
error_screen_handler_ = new ErrorScreenHandler(); |
AddScreenHandler(error_screen_handler_); |
- // Initialize ErrorScreen if it hasn't initialized so that NetworkErrorModel |
- // is binded properly. |
- NetworkErrorModel* network_error_model = nullptr; |
- if (WizardController::default_controller()) { |
- network_error_model = static_cast<NetworkErrorModel*>( |
- WizardController::default_controller()->GetScreen( |
- WizardController::kErrorScreenName)); |
- CHECK(network_error_model); |
- } else { |
- error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_)); |
- network_error_model = error_screen_.get(); |
- } |
+ error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_)); |
+ NetworkErrorModel* network_error_model = error_screen_.get(); |
EnrollmentScreenHandler* enrollment_screen_handler = |
new EnrollmentScreenHandler(network_state_informer_, network_error_model); |
@@ -464,8 +454,8 @@ UserImageView* OobeUI::GetUserImageView() { |
return user_image_view_; |
} |
-NetworkErrorView* OobeUI::GetNetworkErrorView() { |
- return error_screen_handler_; |
+ErrorScreen* OobeUI::GetErrorScreen() { |
+ return error_screen_.get(); |
} |
SupervisedUserCreationScreenHandler* |
@@ -523,10 +513,6 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { |
localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off"); |
} |
-scoped_ptr<ErrorScreen> OobeUI::GetErrorScreen() { |
- return error_screen_.Pass(); |
-} |
- |
void OobeUI::InitializeScreenMaps() { |
screen_names_.resize(SCREEN_UNKNOWN); |
screen_names_[SCREEN_OOBE_HID_DETECTION] = kScreenOobeHIDDetection; |