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

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

Issue 2713513009: cros: Break BaseScreenHandler into two classes. (Closed)
Patch Set: Add comments, fix compile Created 3 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/ui/webui/chromeos/login/enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
index 00ae028814943e8e5dac34a9675bcc1ce3c1f264..f516642381591fce83ee7f11d18f15eb7ba60f26 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -123,13 +123,13 @@ enum ActiveDirectoryErrorState {
EnrollmentScreenHandler::EnrollmentScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
ErrorScreen* error_screen)
- : network_state_informer_(network_state_informer),
+ : BaseScreenHandler(kScreenId),
+ network_state_informer_(network_state_informer),
error_screen_(error_screen),
histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
weak_ptr_factory_(this) {
set_call_js_prefix(kJsScreenPath);
- set_async_assets_load_id(
- GetOobeScreenName(OobeScreen::SCREEN_OOBE_ENROLLMENT));
+ set_async_assets_load_id(GetOobeScreenName(kScreenId));
DCHECK(network_state_informer_.get());
DCHECK(error_screen_);
network_state_informer_->AddObserver(this);
@@ -414,13 +414,12 @@ void EnrollmentScreenHandler::DeclareLocalizedValues(
}
bool EnrollmentScreenHandler::IsOnEnrollmentScreen() const {
- return (GetCurrentScreen() == OobeScreen::SCREEN_OOBE_ENROLLMENT);
+ return (GetCurrentScreen() == kScreenId);
}
bool EnrollmentScreenHandler::IsEnrollmentScreenHiddenByError() const {
return (GetCurrentScreen() == OobeScreen::SCREEN_ERROR_MESSAGE &&
- error_screen_->GetParentScreen() ==
- OobeScreen::SCREEN_OOBE_ENROLLMENT);
+ error_screen_->GetParentScreen() == kScreenId);
}
void EnrollmentScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
@@ -500,7 +499,7 @@ void EnrollmentScreenHandler::SetupAndShowOfflineMessage(
if (GetCurrentScreen() != OobeScreen::SCREEN_ERROR_MESSAGE) {
const std::string network_type = network_state_informer_->network_type();
error_screen_->SetUIState(NetworkError::UI_STATE_SIGNIN);
- error_screen_->SetParentScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT);
+ error_screen_->SetParentScreen(kScreenId);
error_screen_->SetHideCallback(base::Bind(&EnrollmentScreenHandler::DoShow,
weak_ptr_factory_.GetWeakPtr()));
error_screen_->Show();

Powered by Google App Engine
This is Rietveld 408576698