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

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

Issue 755203002: Added usage of ScreenContext in EulaScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix to Screen.initialize(). Created 6 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ec04f83566441e37a0efd51790292267d726a919..9ff18b76fa52e620bc624659a529ad5310961d73 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -194,7 +194,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
update_screen_handler_(NULL),
network_screen_actor_(NULL),
debugging_screen_actor_(NULL),
- eula_screen_actor_(NULL),
+ eula_view_(NULL),
hid_detection_screen_actor_(NULL),
reset_screen_actor_(NULL),
autolaunch_screen_actor_(NULL),
@@ -244,7 +244,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
AddScreenHandler(debugging_screen_handler);
EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_);
- eula_screen_actor_ = eula_screen_handler;
+ eula_view_ = eula_screen_handler;
AddScreenHandler(eula_screen_handler);
ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
@@ -397,8 +397,8 @@ NetworkScreenActor* OobeUI::GetNetworkScreenActor() {
return network_screen_actor_;
}
-EulaScreenActor* OobeUI::GetEulaScreenActor() {
- return eula_screen_actor_;
+EulaView* OobeUI::GetEulaView() {
+ return eula_view_;
}
EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698