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

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

Issue 898453002: HID-detection screen moved to screenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« 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 4cbe49076483831004b5afe5540d0cb4b57f94d7..5efc7eef465e5171354c39e303926143a4107a96 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -207,8 +207,8 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
network_view_(nullptr),
debugging_screen_actor_(nullptr),
eula_view_(nullptr),
- hid_detection_screen_actor_(nullptr),
reset_view_(nullptr),
+ hid_detection_view_(nullptr),
autolaunch_screen_actor_(nullptr),
kiosk_enable_screen_actor_(nullptr),
wrong_hwid_screen_actor_(nullptr),
@@ -291,7 +291,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
HIDDetectionScreenHandler* hid_detection_screen_handler =
new HIDDetectionScreenHandler(core_handler_);
- hid_detection_screen_actor_ = hid_detection_screen_handler;
+ hid_detection_view_ = hid_detection_screen_handler;
AddScreenHandler(hid_detection_screen_handler);
error_screen_handler_ = new ErrorScreenHandler();
@@ -451,8 +451,8 @@ AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() {
return auto_enrollment_check_screen_actor_;
}
-HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
- return hid_detection_screen_actor_;
+HIDDetectionView* OobeUI::GetHIDDetectionView() {
+ return hid_detection_view_;
}
ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() {
« 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