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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 917613005: Revert of Reset Screen moved to ScreenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 7700590f7763a67649ce097fe46d6162e389cefd..44de6a9780d3fca196b4cb0dec0e4a309753bfee 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -208,7 +208,7 @@
debugging_screen_actor_(nullptr),
eula_view_(nullptr),
hid_detection_screen_actor_(nullptr),
- reset_view_(nullptr),
+ reset_screen_actor_(nullptr),
autolaunch_screen_actor_(nullptr),
kiosk_enable_screen_actor_(nullptr),
wrong_hwid_screen_actor_(nullptr),
@@ -260,7 +260,7 @@
AddScreenHandler(eula_screen_handler);
ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
- reset_view_ = reset_screen_handler;
+ reset_screen_actor_ = reset_screen_handler;
AddScreenHandler(reset_screen_handler);
KioskAutolaunchScreenHandler* autolaunch_screen_handler =
@@ -425,8 +425,8 @@
return enrollment_screen_actor_;
}
-ResetView* OobeUI::GetResetView() {
- return reset_view_;
+ResetScreenActor* OobeUI::GetResetScreenActor() {
+ return reset_screen_actor_;
}
KioskAutolaunchScreenActor* OobeUI::GetKioskAutolaunchScreenActor() {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698