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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen.cc

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.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc
index 0a119b5ad6b351ea8d144f1d78ab1bc0001b998f..940c28f8e437f03e8f11ec2e4bbc0b25e6025425 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -92,11 +92,10 @@ UpdateScreen* UpdateScreen::Get(ScreenManager* manager) {
manager->GetScreen(WizardController::kUpdateScreenName));
}
-UpdateScreen::UpdateScreen(
- ScreenObserver* screen_observer,
- UpdateScreenActor* actor,
- HostPairingController* remora_controller)
- : WizardScreen(screen_observer),
+UpdateScreen::UpdateScreen(ScreenObserver* screen_observer,
+ UpdateScreenActor* actor,
+ HostPairingController* remora_controller)
+ : BaseScreen(screen_observer),
state_(STATE_IDLE),
reboot_check_delay_(0),
is_checking_for_update_(true),
« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen.h ('k') | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698