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

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

Issue 915133002: Revert of HID-detection 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
« 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 0f6bbf4a92223b5edf8f46968eef80d16d9d88c1..44de6a9780d3fca196b4cb0dec0e4a309753bfee 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -207,7 +207,7 @@
network_view_(nullptr),
debugging_screen_actor_(nullptr),
eula_view_(nullptr),
- hid_detection_view_(nullptr),
+ hid_detection_screen_actor_(nullptr),
reset_screen_actor_(nullptr),
autolaunch_screen_actor_(nullptr),
kiosk_enable_screen_actor_(nullptr),
@@ -291,7 +291,7 @@
HIDDetectionScreenHandler* hid_detection_screen_handler =
new HIDDetectionScreenHandler(core_handler_);
- hid_detection_view_ = hid_detection_screen_handler;
+ hid_detection_screen_actor_ = hid_detection_screen_handler;
AddScreenHandler(hid_detection_screen_handler);
error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
@@ -449,8 +449,8 @@
return auto_enrollment_check_screen_actor_;
}
-HIDDetectionView* OobeUI::GetHIDDetectionView() {
- return hid_detection_view_;
+HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
+ return hid_detection_screen_actor_;
}
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