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

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

Issue 904163003: Reset Screen moved to ScreenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include for GetNativeWindow added. 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 4b107dfc181a2bff301ebf6cf0cbeafe6af49388..4cbe49076483831004b5afe5540d0cb4b57f94d7 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 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
debugging_screen_actor_(nullptr),
eula_view_(nullptr),
hid_detection_screen_actor_(nullptr),
- reset_screen_actor_(nullptr),
+ reset_view_(nullptr),
autolaunch_screen_actor_(nullptr),
kiosk_enable_screen_actor_(nullptr),
wrong_hwid_screen_actor_(nullptr),
@@ -260,7 +260,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
AddScreenHandler(eula_screen_handler);
ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
- reset_screen_actor_ = reset_screen_handler;
+ reset_view_ = reset_screen_handler;
AddScreenHandler(reset_screen_handler);
KioskAutolaunchScreenHandler* autolaunch_screen_handler =
@@ -427,8 +427,8 @@ EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() {
return enrollment_screen_actor_;
}
-ResetScreenActor* OobeUI::GetResetScreenActor() {
- return reset_screen_actor_;
+ResetView* OobeUI::GetResetView() {
+ return reset_view_;
}
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