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

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 2 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/supervised/supervised_user_creation_screen.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index df68da7d982d8a0f02d8eff84cb24b388ef59170..35bc61e951e6c0a2bb1ec2bf24d26025f34df7f2 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -12,8 +12,8 @@
#include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/screen_manager.h"
+#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/error_screen.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
#include "chrome/browser/chromeos/login/signin_specifics.h"
#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h"
@@ -96,9 +96,9 @@ SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
}
SupervisedUserCreationScreen::SupervisedUserCreationScreen(
- ScreenObserver* observer,
+ BaseScreenDelegate* base_screen_delegate,
SupervisedUserCreationScreenHandler* actor)
- : BaseScreen(observer),
+ : BaseScreen(base_screen_delegate),
actor_(actor),
on_error_screen_(false),
manager_signin_in_progress_(false),
@@ -156,14 +156,14 @@ void SupervisedUserCreationScreen::OnPortalDetectionCompleted(
const NetworkState* network,
const NetworkPortalDetector::CaptivePortalState& state) {
if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
- get_screen_observer()->HideErrorScreen(this);
+ get_base_screen_delegate()->HideErrorScreen(this);
histogram_helper_->OnErrorHide();
} else {
on_error_screen_ = true;
- ErrorScreen* screen = get_screen_observer()->GetErrorScreen();
+ ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen();
ConfigureErrorScreen(screen, network, state.status);
screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED);
- get_screen_observer()->ShowErrorScreen();
+ get_base_screen_delegate()->ShowErrorScreen();
histogram_helper_->OnErrorShow(screen->GetErrorState());
}
}

Powered by Google App Engine
This is Rietveld 408576698