OLD | NEW |
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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
11 #include "ash/common/wm/screen_dimmer.h" | 11 #include "ash/common/wm/screen_dimmer.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/browser_process_platform_part.h" | 19 #include "chrome/browser/browser_process_platform_part.h" |
20 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" | 20 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
view.h" |
21 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" | 21 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h" |
22 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 22 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
23 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 23 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
24 #include "chrome/browser/chromeos/login/wizard_controller.h" | 24 #include "chrome/browser/chromeos/login/wizard_controller.h" |
25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
26 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" | 26 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" |
27 #include "chrome/browser/chromeos/system/input_device_settings.h" | 27 #include "chrome/browser/chromeos/system/input_device_settings.h" |
28 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" | 28 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" |
29 #include "chrome/browser/extensions/tab_helper.h" | 29 #include "chrome/browser/extensions/tab_helper.h" |
30 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
31 #include "chrome/browser/ui/ash/ash_util.h" | 31 #include "chrome/browser/ui/ash/ash_util.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 | 228 |
229 if (display_type_ == kOobeDisplay) { | 229 if (display_type_ == kOobeDisplay) { |
230 auto network_screen_handler = | 230 auto network_screen_handler = |
231 base::MakeUnique<NetworkScreenHandler>(core_handler_); | 231 base::MakeUnique<NetworkScreenHandler>(core_handler_); |
232 network_view_ = network_screen_handler.get(); | 232 network_view_ = network_screen_handler.get(); |
233 AddScreenHandler(std::move(network_screen_handler)); | 233 AddScreenHandler(std::move(network_screen_handler)); |
234 } | 234 } |
235 | 235 |
236 auto debugging_screen_handler = | 236 auto debugging_screen_handler = |
237 base::MakeUnique<EnableDebuggingScreenHandler>(); | 237 base::MakeUnique<EnableDebuggingScreenHandler>(); |
238 debugging_screen_actor_ = debugging_screen_handler.get(); | 238 debugging_screen_view_ = debugging_screen_handler.get(); |
239 AddScreenHandler(std::move(debugging_screen_handler)); | 239 AddScreenHandler(std::move(debugging_screen_handler)); |
240 | 240 |
241 auto eula_screen_handler = base::MakeUnique<EulaScreenHandler>(core_handler_); | 241 auto eula_screen_handler = base::MakeUnique<EulaScreenHandler>(core_handler_); |
242 eula_view_ = eula_screen_handler.get(); | 242 eula_view_ = eula_screen_handler.get(); |
243 AddScreenHandler(std::move(eula_screen_handler)); | 243 AddScreenHandler(std::move(eula_screen_handler)); |
244 | 244 |
245 auto reset_screen_handler = base::MakeUnique<ResetScreenHandler>(); | 245 auto reset_screen_handler = base::MakeUnique<ResetScreenHandler>(); |
246 reset_view_ = reset_screen_handler.get(); | 246 reset_view_ = reset_screen_handler.get(); |
247 AddScreenHandler(std::move(reset_screen_handler)); | 247 AddScreenHandler(std::move(reset_screen_handler)); |
248 | 248 |
249 auto autolaunch_screen_handler = | 249 auto autolaunch_screen_handler = |
250 base::MakeUnique<KioskAutolaunchScreenHandler>(); | 250 base::MakeUnique<KioskAutolaunchScreenHandler>(); |
251 autolaunch_screen_actor_ = autolaunch_screen_handler.get(); | 251 autolaunch_screen_view_ = autolaunch_screen_handler.get(); |
252 AddScreenHandler(std::move(autolaunch_screen_handler)); | 252 AddScreenHandler(std::move(autolaunch_screen_handler)); |
253 | 253 |
254 auto kiosk_enable_screen_handler = | 254 auto kiosk_enable_screen_handler = |
255 base::MakeUnique<KioskEnableScreenHandler>(); | 255 base::MakeUnique<KioskEnableScreenHandler>(); |
256 kiosk_enable_screen_actor_ = kiosk_enable_screen_handler.get(); | 256 kiosk_enable_screen_view_ = kiosk_enable_screen_handler.get(); |
257 AddScreenHandler(std::move(kiosk_enable_screen_handler)); | 257 AddScreenHandler(std::move(kiosk_enable_screen_handler)); |
258 | 258 |
259 auto supervised_user_creation_screen_handler = | 259 auto supervised_user_creation_screen_handler = |
260 base::MakeUnique<SupervisedUserCreationScreenHandler>(); | 260 base::MakeUnique<SupervisedUserCreationScreenHandler>(); |
261 supervised_user_creation_screen_actor_ = | 261 supervised_user_creation_screen_view_ = |
262 supervised_user_creation_screen_handler.get(); | 262 supervised_user_creation_screen_handler.get(); |
263 AddScreenHandler(std::move(supervised_user_creation_screen_handler)); | 263 AddScreenHandler(std::move(supervised_user_creation_screen_handler)); |
264 | 264 |
265 auto wrong_hwid_screen_handler = base::MakeUnique<WrongHWIDScreenHandler>(); | 265 auto wrong_hwid_screen_handler = base::MakeUnique<WrongHWIDScreenHandler>(); |
266 wrong_hwid_screen_actor_ = wrong_hwid_screen_handler.get(); | 266 wrong_hwid_screen_view_ = wrong_hwid_screen_handler.get(); |
267 AddScreenHandler(std::move(wrong_hwid_screen_handler)); | 267 AddScreenHandler(std::move(wrong_hwid_screen_handler)); |
268 | 268 |
269 auto auto_enrollment_check_screen_handler = | 269 auto auto_enrollment_check_screen_handler = |
270 base::MakeUnique<AutoEnrollmentCheckScreenHandler>(); | 270 base::MakeUnique<AutoEnrollmentCheckScreenHandler>(); |
271 auto_enrollment_check_screen_actor_ = | 271 auto_enrollment_check_screen_view_ = |
272 auto_enrollment_check_screen_handler.get(); | 272 auto_enrollment_check_screen_handler.get(); |
273 AddScreenHandler(std::move(auto_enrollment_check_screen_handler)); | 273 AddScreenHandler(std::move(auto_enrollment_check_screen_handler)); |
274 | 274 |
275 auto hid_detection_screen_handler = | 275 auto hid_detection_screen_handler = |
276 base::MakeUnique<HIDDetectionScreenHandler>(core_handler_); | 276 base::MakeUnique<HIDDetectionScreenHandler>(core_handler_); |
277 hid_detection_view_ = hid_detection_screen_handler.get(); | 277 hid_detection_view_ = hid_detection_screen_handler.get(); |
278 AddScreenHandler(std::move(hid_detection_screen_handler)); | 278 AddScreenHandler(std::move(hid_detection_screen_handler)); |
279 | 279 |
280 auto error_screen_handler = base::MakeUnique<ErrorScreenHandler>(); | 280 auto error_screen_handler = base::MakeUnique<ErrorScreenHandler>(); |
281 error_screen_handler_ = error_screen_handler.get(); | 281 error_screen_handler_ = error_screen_handler.get(); |
282 AddScreenHandler(std::move(error_screen_handler)); | 282 AddScreenHandler(std::move(error_screen_handler)); |
283 network_dropdown_handler_->AddObserver(error_screen_handler_); | 283 network_dropdown_handler_->AddObserver(error_screen_handler_); |
284 | 284 |
285 error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_)); | 285 error_screen_.reset(new ErrorScreen(nullptr, error_screen_handler_)); |
286 ErrorScreen* error_screen = error_screen_.get(); | 286 ErrorScreen* error_screen = error_screen_.get(); |
287 | 287 |
288 auto enrollment_screen_handler = base::MakeUnique<EnrollmentScreenHandler>( | 288 auto enrollment_screen_handler = base::MakeUnique<EnrollmentScreenHandler>( |
289 network_state_informer_, error_screen); | 289 network_state_informer_, error_screen); |
290 enrollment_screen_actor_ = enrollment_screen_handler.get(); | 290 enrollment_screen_view_ = enrollment_screen_handler.get(); |
291 AddScreenHandler(std::move(enrollment_screen_handler)); | 291 AddScreenHandler(std::move(enrollment_screen_handler)); |
292 | 292 |
293 auto terms_of_service_screen_handler = | 293 auto terms_of_service_screen_handler = |
294 base::MakeUnique<TermsOfServiceScreenHandler>(core_handler_); | 294 base::MakeUnique<TermsOfServiceScreenHandler>(core_handler_); |
295 terms_of_service_screen_actor_ = terms_of_service_screen_handler.get(); | 295 terms_of_service_screen_view_ = terms_of_service_screen_handler.get(); |
296 AddScreenHandler(std::move(terms_of_service_screen_handler)); | 296 AddScreenHandler(std::move(terms_of_service_screen_handler)); |
297 | 297 |
298 auto arc_terms_of_service_screen_handler = | 298 auto arc_terms_of_service_screen_handler = |
299 base::MakeUnique<ArcTermsOfServiceScreenHandler>(); | 299 base::MakeUnique<ArcTermsOfServiceScreenHandler>(); |
300 arc_terms_of_service_screen_actor_ = | 300 arc_terms_of_service_screen_view_ = arc_terms_of_service_screen_handler.get(); |
301 arc_terms_of_service_screen_handler.get(); | |
302 AddScreenHandler(std::move(arc_terms_of_service_screen_handler)); | 301 AddScreenHandler(std::move(arc_terms_of_service_screen_handler)); |
303 | 302 |
304 auto user_image_screen_handler = base::MakeUnique<UserImageScreenHandler>(); | 303 auto user_image_screen_handler = base::MakeUnique<UserImageScreenHandler>(); |
305 user_image_view_ = user_image_screen_handler.get(); | 304 user_image_view_ = user_image_screen_handler.get(); |
306 AddScreenHandler(std::move(user_image_screen_handler)); | 305 AddScreenHandler(std::move(user_image_screen_handler)); |
307 | 306 |
308 auto user_board_screen_handler = base::MakeUnique<UserBoardScreenHandler>(); | 307 auto user_board_screen_handler = base::MakeUnique<UserBoardScreenHandler>(); |
309 user_board_screen_handler_ = user_board_screen_handler.get(); | 308 user_board_screen_handler_ = user_board_screen_handler.get(); |
310 AddScreenHandler(std::move(user_board_screen_handler)); | 309 AddScreenHandler(std::move(user_board_screen_handler)); |
311 | 310 |
312 auto gaia_screen_handler = base::MakeUnique<GaiaScreenHandler>( | 311 auto gaia_screen_handler = base::MakeUnique<GaiaScreenHandler>( |
313 core_handler_, network_state_informer_); | 312 core_handler_, network_state_informer_); |
314 gaia_screen_handler_ = gaia_screen_handler.get(); | 313 gaia_screen_handler_ = gaia_screen_handler.get(); |
315 AddScreenHandler(std::move(gaia_screen_handler)); | 314 AddScreenHandler(std::move(gaia_screen_handler)); |
316 | 315 |
317 auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>( | 316 auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>( |
318 network_state_informer_, error_screen, core_handler_, | 317 network_state_informer_, error_screen, core_handler_, |
319 gaia_screen_handler_); | 318 gaia_screen_handler_); |
320 signin_screen_handler_ = signin_screen_handler.get(); | 319 signin_screen_handler_ = signin_screen_handler.get(); |
321 AddScreenHandler(std::move(signin_screen_handler)); | 320 AddScreenHandler(std::move(signin_screen_handler)); |
322 | 321 |
323 auto app_launch_splash_screen_handler = | 322 auto app_launch_splash_screen_handler = |
324 base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_, | 323 base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_, |
325 error_screen); | 324 error_screen); |
326 app_launch_splash_screen_actor_ = app_launch_splash_screen_handler.get(); | 325 app_launch_splash_screen_view_ = app_launch_splash_screen_handler.get(); |
327 AddScreenHandler(std::move(app_launch_splash_screen_handler)); | 326 AddScreenHandler(std::move(app_launch_splash_screen_handler)); |
328 | 327 |
329 auto arc_kiosk_splash_screen_handler = | 328 auto arc_kiosk_splash_screen_handler = |
330 base::MakeUnique<ArcKioskSplashScreenHandler>(); | 329 base::MakeUnique<ArcKioskSplashScreenHandler>(); |
331 arc_kiosk_splash_screen_actor_ = arc_kiosk_splash_screen_handler.get(); | 330 arc_kiosk_splash_screen_view_ = arc_kiosk_splash_screen_handler.get(); |
332 AddScreenHandler(std::move(arc_kiosk_splash_screen_handler)); | 331 AddScreenHandler(std::move(arc_kiosk_splash_screen_handler)); |
333 | 332 |
334 if (display_type_ == kOobeDisplay) { | 333 if (display_type_ == kOobeDisplay) { |
335 auto controller_pairing_handler = | 334 auto controller_pairing_handler = |
336 base::MakeUnique<ControllerPairingScreenHandler>(); | 335 base::MakeUnique<ControllerPairingScreenHandler>(); |
337 controller_pairing_screen_actor_ = controller_pairing_handler.get(); | 336 controller_pairing_screen_view_ = controller_pairing_handler.get(); |
338 AddScreenHandler(std::move(controller_pairing_handler)); | 337 AddScreenHandler(std::move(controller_pairing_handler)); |
339 | 338 |
340 auto host_pairing_handler = base::MakeUnique<HostPairingScreenHandler>(); | 339 auto host_pairing_handler = base::MakeUnique<HostPairingScreenHandler>(); |
341 host_pairing_screen_actor_ = host_pairing_handler.get(); | 340 host_pairing_screen_view_ = host_pairing_handler.get(); |
342 AddScreenHandler(std::move(host_pairing_handler)); | 341 AddScreenHandler(std::move(host_pairing_handler)); |
343 } | 342 } |
344 | 343 |
345 auto device_disabled_screen_handler = | 344 auto device_disabled_screen_handler = |
346 base::MakeUnique<DeviceDisabledScreenHandler>(); | 345 base::MakeUnique<DeviceDisabledScreenHandler>(); |
347 device_disabled_screen_actor_ = device_disabled_screen_handler.get(); | 346 device_disabled_screen_view_ = device_disabled_screen_handler.get(); |
348 AddScreenHandler(std::move(device_disabled_screen_handler)); | 347 AddScreenHandler(std::move(device_disabled_screen_handler)); |
349 | 348 |
350 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. | 349 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. |
351 auto kiosk_app_menu_handler = | 350 auto kiosk_app_menu_handler = |
352 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_); | 351 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_); |
353 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get(); | 352 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get(); |
354 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler)); | 353 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler)); |
355 | 354 |
356 base::DictionaryValue localized_strings; | 355 base::DictionaryValue localized_strings; |
357 GetLocalizedStrings(&localized_strings); | 356 GetLocalizedStrings(&localized_strings); |
(...skipping 27 matching lines...) Expand all Loading... |
385 OobeUI::~OobeUI() { | 384 OobeUI::~OobeUI() { |
386 core_handler_->SetDelegate(nullptr); | 385 core_handler_->SetDelegate(nullptr); |
387 network_dropdown_handler_->RemoveObserver(error_screen_handler_); | 386 network_dropdown_handler_->RemoveObserver(error_screen_handler_); |
388 if (chrome::IsRunningInMash()) { | 387 if (chrome::IsRunningInMash()) { |
389 // TODO: Ash needs to expose screen dimming api. See | 388 // TODO: Ash needs to expose screen dimming api. See |
390 // http://crbug.com/646034. | 389 // http://crbug.com/646034. |
391 NOTIMPLEMENTED(); | 390 NOTIMPLEMENTED(); |
392 } | 391 } |
393 } | 392 } |
394 | 393 |
395 CoreOobeActor* OobeUI::GetCoreOobeActor() { | 394 CoreOobeView* OobeUI::GetCoreOobeView() { |
396 return core_handler_; | 395 return core_handler_; |
397 } | 396 } |
398 | 397 |
399 NetworkView* OobeUI::GetNetworkView() { | 398 NetworkView* OobeUI::GetNetworkView() { |
400 return network_view_; | 399 return network_view_; |
401 } | 400 } |
402 | 401 |
403 EulaView* OobeUI::GetEulaView() { | 402 EulaView* OobeUI::GetEulaView() { |
404 return eula_view_; | 403 return eula_view_; |
405 } | 404 } |
406 | 405 |
407 UpdateView* OobeUI::GetUpdateView() { | 406 UpdateView* OobeUI::GetUpdateView() { |
408 return update_view_; | 407 return update_view_; |
409 } | 408 } |
410 | 409 |
411 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() { | 410 EnableDebuggingScreenView* OobeUI::GetEnableDebuggingScreenView() { |
412 return debugging_screen_actor_; | 411 return debugging_screen_view_; |
413 } | 412 } |
414 | 413 |
415 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() { | 414 EnrollmentScreenView* OobeUI::GetEnrollmentScreenView() { |
416 return enrollment_screen_actor_; | 415 return enrollment_screen_view_; |
417 } | 416 } |
418 | 417 |
419 ResetView* OobeUI::GetResetView() { | 418 ResetView* OobeUI::GetResetView() { |
420 return reset_view_; | 419 return reset_view_; |
421 } | 420 } |
422 | 421 |
423 KioskAutolaunchScreenActor* OobeUI::GetKioskAutolaunchScreenActor() { | 422 KioskAutolaunchScreenView* OobeUI::GetKioskAutolaunchScreenView() { |
424 return autolaunch_screen_actor_; | 423 return autolaunch_screen_view_; |
425 } | 424 } |
426 | 425 |
427 KioskEnableScreenActor* OobeUI::GetKioskEnableScreenActor() { | 426 KioskEnableScreenView* OobeUI::GetKioskEnableScreenView() { |
428 return kiosk_enable_screen_actor_; | 427 return kiosk_enable_screen_view_; |
429 } | 428 } |
430 | 429 |
431 TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() { | 430 TermsOfServiceScreenView* OobeUI::GetTermsOfServiceScreenView() { |
432 return terms_of_service_screen_actor_; | 431 return terms_of_service_screen_view_; |
433 } | 432 } |
434 | 433 |
435 ArcTermsOfServiceScreenActor* OobeUI::GetArcTermsOfServiceScreenActor() { | 434 ArcTermsOfServiceScreenView* OobeUI::GetArcTermsOfServiceScreenView() { |
436 return arc_terms_of_service_screen_actor_; | 435 return arc_terms_of_service_screen_view_; |
437 } | 436 } |
438 | 437 |
439 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() { | 438 WrongHWIDScreenView* OobeUI::GetWrongHWIDScreenView() { |
440 return wrong_hwid_screen_actor_; | 439 return wrong_hwid_screen_view_; |
441 } | 440 } |
442 | 441 |
443 AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() { | 442 AutoEnrollmentCheckScreenView* OobeUI::GetAutoEnrollmentCheckScreenView() { |
444 return auto_enrollment_check_screen_actor_; | 443 return auto_enrollment_check_screen_view_; |
445 } | 444 } |
446 | 445 |
447 HIDDetectionView* OobeUI::GetHIDDetectionView() { | 446 HIDDetectionView* OobeUI::GetHIDDetectionView() { |
448 return hid_detection_view_; | 447 return hid_detection_view_; |
449 } | 448 } |
450 | 449 |
451 ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() { | 450 ControllerPairingScreenView* OobeUI::GetControllerPairingScreenView() { |
452 return controller_pairing_screen_actor_; | 451 return controller_pairing_screen_view_; |
453 } | 452 } |
454 | 453 |
455 HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() { | 454 HostPairingScreenView* OobeUI::GetHostPairingScreenView() { |
456 return host_pairing_screen_actor_; | 455 return host_pairing_screen_view_; |
457 } | 456 } |
458 | 457 |
459 DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() { | 458 DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() { |
460 return device_disabled_screen_actor_; | 459 return device_disabled_screen_view_; |
461 } | 460 } |
462 | 461 |
463 UserImageView* OobeUI::GetUserImageView() { | 462 UserImageView* OobeUI::GetUserImageView() { |
464 return user_image_view_; | 463 return user_image_view_; |
465 } | 464 } |
466 | 465 |
467 ErrorScreen* OobeUI::GetErrorScreen() { | 466 ErrorScreen* OobeUI::GetErrorScreen() { |
468 return error_screen_.get(); | 467 return error_screen_.get(); |
469 } | 468 } |
470 | 469 |
471 SupervisedUserCreationScreenHandler* | 470 SupervisedUserCreationScreenHandler* |
472 OobeUI::GetSupervisedUserCreationScreenActor() { | 471 OobeUI::GetSupervisedUserCreationScreenView() { |
473 return supervised_user_creation_screen_actor_; | 472 return supervised_user_creation_screen_view_; |
474 } | 473 } |
475 | 474 |
476 GaiaScreenHandler* OobeUI::GetGaiaScreenActor() { | 475 GaiaScreenHandler* OobeUI::GetGaiaScreenView() { |
477 return gaia_screen_handler_; | 476 return gaia_screen_handler_; |
478 } | 477 } |
479 | 478 |
480 UserBoardView* OobeUI::GetUserBoardScreenActor() { | 479 UserBoardView* OobeUI::GetUserBoardView() { |
481 return user_board_screen_handler_; | 480 return user_board_screen_handler_; |
482 } | 481 } |
483 | 482 |
484 void OobeUI::OnShutdownPolicyChanged(bool reboot_on_shutdown) { | 483 void OobeUI::OnShutdownPolicyChanged(bool reboot_on_shutdown) { |
485 core_handler_->UpdateShutdownAndRebootVisibility(reboot_on_shutdown); | 484 core_handler_->UpdateShutdownAndRebootVisibility(reboot_on_shutdown); |
486 } | 485 } |
487 | 486 |
488 AppLaunchSplashScreenActor* | 487 AppLaunchSplashScreenView* OobeUI::GetAppLaunchSplashScreenView() { |
489 OobeUI::GetAppLaunchSplashScreenActor() { | 488 return app_launch_splash_screen_view_; |
490 return app_launch_splash_screen_actor_; | |
491 } | 489 } |
492 | 490 |
493 ArcKioskSplashScreenActor* OobeUI::GetArcKioskSplashScreenActor() { | 491 ArcKioskSplashScreenView* OobeUI::GetArcKioskSplashScreenView() { |
494 return arc_kiosk_splash_screen_actor_; | 492 return arc_kiosk_splash_screen_view_; |
495 } | 493 } |
496 | 494 |
497 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { | 495 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) { |
498 // Note, handlers_[0] is a GenericHandler used by the WebUI. | 496 // Note, handlers_[0] is a GenericHandler used by the WebUI. |
499 for (size_t i = 0; i < handlers_.size(); ++i) { | 497 for (size_t i = 0; i < handlers_.size(); ++i) { |
500 handlers_[i]->GetLocalizedStrings(localized_strings); | 498 handlers_[i]->GetLocalizedStrings(localized_strings); |
501 } | 499 } |
502 const std::string& app_locale = g_browser_process->GetApplicationLocale(); | 500 const std::string& app_locale = g_browser_process->GetApplicationLocale(); |
503 webui::SetLoadTimeDataDefaults(app_locale, localized_strings); | 501 webui::SetLoadTimeDataDefaults(app_locale, localized_strings); |
504 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); | 502 kiosk_app_menu_handler_->GetLocalizedStrings(localized_strings); |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
635 } | 633 } |
636 | 634 |
637 void OobeUI::UpdateLocalizedStringsIfNeeded() { | 635 void OobeUI::UpdateLocalizedStringsIfNeeded() { |
638 if (oobe_ui_md_mode_ == | 636 if (oobe_ui_md_mode_ == |
639 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) { | 637 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) { |
640 return; | 638 return; |
641 } | 639 } |
642 | 640 |
643 base::DictionaryValue localized_strings; | 641 base::DictionaryValue localized_strings; |
644 GetLocalizedStrings(&localized_strings); | 642 GetLocalizedStrings(&localized_strings); |
645 static_cast<CoreOobeActor*>(core_handler_)->ReloadContent(localized_strings); | 643 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); |
646 } | 644 } |
647 | 645 |
648 } // namespace chromeos | 646 } // namespace chromeos |
OLD | NEW |