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

Unified Diff: chrome/browser/chromeos/login/screens/controller_pairing_screen.h

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: 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.h
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
index 9a0b6c567b03c684122797e09168fccccb88e4e0..fcb89de233ace01aa0015f161b0231d9f93d9eb2 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
@@ -7,17 +7,17 @@
#include "base/macros.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
#include "chrome/browser/chromeos/login/screens/screen_context.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
#include "components/pairing/controller_pairing_controller.h"
namespace chromeos {
-class ControllerPairingScreen :
- public WizardScreen,
- public pairing_chromeos::ControllerPairingController::Observer,
- public ControllerPairingScreenActor::Delegate {
+class ControllerPairingScreen
+ : public BaseScreen,
+ public pairing_chromeos::ControllerPairingController::Observer,
+ public ControllerPairingScreenActor::Delegate {
public:
ControllerPairingScreen(
ScreenObserver* observer,
@@ -31,7 +31,7 @@ class ControllerPairingScreen :
void CommitContextChanges();
bool ExpectStageIs(Stage stage) const;
- // Overridden from WizardScreen:
+ // Overridden from BaseScreen:
virtual void PrepareToShow() override;
virtual void Show() override;
virtual void Hide() override;

Powered by Google App Engine
This is Rietveld 408576698