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

Unified Diff: chrome/browser/chromeos/login/screens/update_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/update_screen.h
diff --git a/chrome/browser/chromeos/login/screens/update_screen.h b/chrome/browser/chromeos/login/screens/update_screen.h
index 7498c6de39a9d46982709b6aab21a1a1888dabdd..f351a575e29353ea382b50c69bba61dcfcc4d520 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.h
+++ b/chrome/browser/chromeos/login/screens/update_screen.h
@@ -13,8 +13,8 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
+#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/update_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
#include "chromeos/dbus/update_engine_client.h"
#include "chromeos/network/portal_detector/network_portal_detector.h"
#include "components/pairing/host_pairing_controller.h"
@@ -29,10 +29,10 @@ class ScreenObserver;
// Controller for the update screen. It does not depend on the specific
// implementation of the screen showing (Views of WebUI based), the dependency
// is moved to the UpdateScreenActor instead.
-class UpdateScreen: public UpdateEngineClient::Observer,
- public UpdateScreenActor::Delegate,
- public WizardScreen,
- public NetworkPortalDetector::Observer {
+class UpdateScreen : public UpdateEngineClient::Observer,
+ public UpdateScreenActor::Delegate,
+ public BaseScreen,
+ public NetworkPortalDetector::Observer {
public:
UpdateScreen(ScreenObserver* screen_observer,
UpdateScreenActor* actor,
@@ -41,7 +41,7 @@ class UpdateScreen: public UpdateEngineClient::Observer,
static UpdateScreen* Get(ScreenManager* manager);
- // 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