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

Side by Side 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: Fixed comments. Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 const char OobeUI::kScreenHostPairing[] = "host-pairing"; 185 const char OobeUI::kScreenHostPairing[] = "host-pairing";
186 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled"; 186 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled";
187 187
188 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) 188 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
189 : WebUIController(web_ui), 189 : WebUIController(web_ui),
190 core_handler_(NULL), 190 core_handler_(NULL),
191 network_dropdown_handler_(NULL), 191 network_dropdown_handler_(NULL),
192 update_screen_handler_(NULL), 192 update_screen_handler_(NULL),
193 network_screen_actor_(NULL), 193 network_screen_actor_(NULL),
194 debugging_screen_actor_(NULL), 194 debugging_screen_actor_(NULL),
195 eula_screen_actor_(NULL), 195 eula_view_(NULL),
196 hid_detection_screen_actor_(NULL), 196 hid_detection_screen_actor_(NULL),
197 reset_screen_actor_(NULL), 197 reset_screen_actor_(NULL),
198 autolaunch_screen_actor_(NULL), 198 autolaunch_screen_actor_(NULL),
199 kiosk_enable_screen_actor_(NULL), 199 kiosk_enable_screen_actor_(NULL),
200 wrong_hwid_screen_actor_(NULL), 200 wrong_hwid_screen_actor_(NULL),
201 auto_enrollment_check_screen_actor_(NULL), 201 auto_enrollment_check_screen_actor_(NULL),
202 supervised_user_creation_screen_actor_(NULL), 202 supervised_user_creation_screen_actor_(NULL),
203 app_launch_splash_screen_actor_(NULL), 203 app_launch_splash_screen_actor_(NULL),
204 controller_pairing_screen_actor_(NULL), 204 controller_pairing_screen_actor_(NULL),
205 host_pairing_screen_actor_(NULL), 205 host_pairing_screen_actor_(NULL),
(...skipping 29 matching lines...) Expand all
235 network_screen_actor_ = network_screen_handler; 235 network_screen_actor_ = network_screen_handler;
236 AddScreenHandler(network_screen_handler); 236 AddScreenHandler(network_screen_handler);
237 } 237 }
238 238
239 EnableDebuggingScreenHandler* debugging_screen_handler = 239 EnableDebuggingScreenHandler* debugging_screen_handler =
240 new EnableDebuggingScreenHandler(); 240 new EnableDebuggingScreenHandler();
241 debugging_screen_actor_ = debugging_screen_handler; 241 debugging_screen_actor_ = debugging_screen_handler;
242 AddScreenHandler(debugging_screen_handler); 242 AddScreenHandler(debugging_screen_handler);
243 243
244 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_); 244 EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_);
245 eula_screen_actor_ = eula_screen_handler; 245 eula_view_ = eula_screen_handler;
246 AddScreenHandler(eula_screen_handler); 246 AddScreenHandler(eula_screen_handler);
247 247
248 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler(); 248 ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
249 reset_screen_actor_ = reset_screen_handler; 249 reset_screen_actor_ = reset_screen_handler;
250 AddScreenHandler(reset_screen_handler); 250 AddScreenHandler(reset_screen_handler);
251 251
252 KioskAutolaunchScreenHandler* autolaunch_screen_handler = 252 KioskAutolaunchScreenHandler* autolaunch_screen_handler =
253 new KioskAutolaunchScreenHandler(); 253 new KioskAutolaunchScreenHandler();
254 autolaunch_screen_actor_ = autolaunch_screen_handler; 254 autolaunch_screen_actor_ = autolaunch_screen_handler;
255 AddScreenHandler(autolaunch_screen_handler); 255 AddScreenHandler(autolaunch_screen_handler);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 384 }
385 385
386 UpdateScreenActor* OobeUI::GetUpdateScreenActor() { 386 UpdateScreenActor* OobeUI::GetUpdateScreenActor() {
387 return update_screen_handler_; 387 return update_screen_handler_;
388 } 388 }
389 389
390 NetworkScreenActor* OobeUI::GetNetworkScreenActor() { 390 NetworkScreenActor* OobeUI::GetNetworkScreenActor() {
391 return network_screen_actor_; 391 return network_screen_actor_;
392 } 392 }
393 393
394 EulaScreenActor* OobeUI::GetEulaScreenActor() { 394 EulaView* OobeUI::GetEulaView() {
395 return eula_screen_actor_; 395 return eula_view_;
396 } 396 }
397 397
398 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() { 398 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() {
399 return debugging_screen_actor_; 399 return debugging_screen_actor_;
400 } 400 }
401 401
402 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() { 402 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() {
403 return enrollment_screen_actor_; 403 return enrollment_screen_actor_;
404 } 404 }
405 405
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 DCHECK(screen_ids_.count(screen)) 602 DCHECK(screen_ids_.count(screen))
603 << "Screen should be registered in InitializeScreenMaps()"; 603 << "Screen should be registered in InitializeScreenMaps()";
604 Screen new_screen = screen_ids_[screen]; 604 Screen new_screen = screen_ids_[screen];
605 FOR_EACH_OBSERVER(Observer, 605 FOR_EACH_OBSERVER(Observer,
606 observer_list_, 606 observer_list_,
607 OnCurrentScreenChanged(current_screen_, new_screen)); 607 OnCurrentScreenChanged(current_screen_, new_screen));
608 current_screen_ = new_screen; 608 current_screen_ = new_screen;
609 } 609 }
610 610
611 } // namespace chromeos 611 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698