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

Unified Diff: chrome/browser/chromeos/login/screens/reset_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/reset_screen.h
diff --git a/chrome/browser/chromeos/login/screens/reset_screen.h b/chrome/browser/chromeos/login/screens/reset_screen.h
index 1dafce1cb93235c31b09958a249ce86a27a17d98..11552f970f186212bfdade7b9a8fbd2a23ea3888 100644
--- a/chrome/browser/chromeos/login/screens/reset_screen.h
+++ b/chrome/browser/chromeos/login/screens/reset_screen.h
@@ -9,19 +9,18 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/reset_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
namespace chromeos {
// Representation independent class that controls screen showing reset to users.
-class ResetScreen : public WizardScreen,
- public ResetScreenActor::Delegate {
+class ResetScreen : public BaseScreen, public ResetScreenActor::Delegate {
public:
ResetScreen(ScreenObserver* observer, ResetScreenActor* actor);
virtual ~ResetScreen();
- // WizardScreen implementation:
+ // BaseScreen implementation:
virtual void PrepareToShow() override;
virtual void Show() override;
virtual void Hide() override;

Powered by Google App Engine
This is Rietveld 408576698