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

Unified Diff: chrome/browser/chromeos/login/screens/controller_pairing_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/screens/controller_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
index 735164bc9758cabc57de9326c6da45f0e2f2fb63..f4aa7401181c1d57ac39f004de328d9294211285 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
@@ -15,10 +15,10 @@ using namespace pairing_chromeos;
namespace chromeos {
ControllerPairingScreen::ControllerPairingScreen(
- ScreenObserver* observer,
+ BaseScreenDelegate* base_screen_delegate,
ControllerPairingScreenActor* actor,
ControllerPairingController* shark_controller)
- : BaseScreen(observer),
+ : BaseScreen(base_screen_delegate),
actor_(actor),
shark_controller_(shark_controller),
delegate_(nullptr),
@@ -118,7 +118,7 @@ void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
}
case ControllerPairingController::STAGE_WAITING_FOR_CREDENTIALS: {
shark_controller_->RemoveObserver(this);
- get_screen_observer()->OnExit(
+ get_base_screen_delegate()->OnExit(
WizardController::CONTROLLER_PAIRING_FINISHED);
desired_page = kPageEnrollmentIntroduction;
break;

Powered by Google App Engine
This is Rietveld 408576698