Example of usage of new features of context and screen.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

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 344304c1a3753082926242949036aae158410436..dcdb3026a7b3a0b306fd66f554d60471151bbc14 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -4,26 +4,19 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
-#include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
-#include "chrome/browser/browser_about_handler.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
-#include "chrome/browser/chromeos/login/lock/screen_locker.h"
-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
-#include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/about_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
@@ -46,7 +39,6 @@
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
-#include "chromeos/chromeos_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -134,29 +126,28 @@ const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
 
 // static
 const char OobeUI::kScreenOobeHIDDetection[] = "hid-detection";
-const char OobeUI::kScreenOobeNetwork[]      = "connect";
-const char OobeUI::kScreenOobeEula[]         = "eula";
-const char OobeUI::kScreenOobeUpdate[]       = "update";
-const char OobeUI::kScreenOobeEnrollment[]   = "oauth-enrollment";
-const char OobeUI::kScreenOobeReset[]        = "reset";
-const char OobeUI::kScreenGaiaSignin[]       = "gaia-signin";
-const char OobeUI::kScreenAccountPicker[]    = "account-picker";
-const char OobeUI::kScreenKioskAutolaunch[]  = "autolaunch";
-const char OobeUI::kScreenKioskEnable[]      = "kiosk-enable";
-const char OobeUI::kScreenErrorMessage[]     = "error-message";
-const char OobeUI::kScreenUserImagePicker[]  = "user-image";
-const char OobeUI::kScreenTpmError[]         = "tpm-error-message";
-const char OobeUI::kScreenPasswordChanged[]  = "password-changed";
-const char OobeUI::kScreenManagedUserCreationFlow[]
-                                             = "managed-user-creation";
-const char OobeUI::kScreenTermsOfService[]   = "terms-of-service";
-const char OobeUI::kScreenWrongHWID[]        = "wrong-hwid";
-const char OobeUI::kScreenAutoEnrollmentCheck[]
-                                             = "auto-enrollment-check";
-const char OobeUI::kScreenHIDDetection[]     = "hid-detection";
-const char OobeUI::kScreenAppLaunchSplash[]  = "app-launch-splash";
-const char OobeUI::kScreenConfirmPassword[]  = "confirm-password";
-const char OobeUI::kScreenFatalError[]       = "fatal-error";
+const char OobeUI::kScreenOobeNetwork[] = "connect";
+const char OobeUI::kScreenOobeEula[] = "eula";
+const char OobeUI::kScreenOobeUpdate[] = "update";
+const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment";
+const char OobeUI::kScreenOobeReset[] = "reset";
+const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
+const char OobeUI::kScreenAccountPicker[] = "account-picker";
+const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
+const char OobeUI::kScreenKioskEnable[] = "kiosk-enable";
+const char OobeUI::kScreenErrorMessage[] = "error-message";
+const char OobeUI::kScreenUserImagePicker[] = "user-image";
+const char OobeUI::kScreenTpmError[] = "tpm-error-message";
+const char OobeUI::kScreenPasswordChanged[] = "password-changed";
+const char OobeUI::kScreenManagedUserCreationFlow[] = "managed-user-creation";
+const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
+const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
+const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check";
+const char OobeUI::kScreenHIDDetection[] = "hid-detection";
+const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
+const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
+const char OobeUI::kScreenFatalError[] = "fatal-error";
+const char OobeUI::kScreenControllerPairing[] = "controller-pairing";
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
@@ -277,6 +268,13 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
   AddScreenHandler(app_launch_splash_screen_handler);
   app_launch_splash_screen_actor_ = app_launch_splash_screen_handler;
 
+  if (display_type_ == kOobeDisplay) {
+    ControllerPairingScreenHandler* handler =
+        new ControllerPairingScreenHandler();
+    controller_pairing_screen_actor_ = handler;
+    AddScreenHandler(handler);
+  }
+
   // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
   kiosk_app_menu_handler_ = new KioskAppMenuHandler;
   web_ui->AddMessageHandler(kiosk_app_menu_handler_);
@@ -310,14 +308,6 @@ OobeUI::~OobeUI() {
   network_dropdown_handler_->RemoveObserver(update_screen_handler_);
 }
 
-void OobeUI::ShowScreen(WizardScreen* screen) {
-  screen->Show();
-}
-
-void OobeUI::HideScreen(WizardScreen* screen) {
-  screen->Hide();
-}
-
 CoreOobeActor* OobeUI::GetCoreOobeActor() {
   return core_handler_;
 }
@@ -366,6 +356,10 @@ HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
   return hid_detection_screen_actor_;
 }
 
+ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() {
+  return controller_pairing_screen_actor_;
+}
+
 UserImageScreenActor* OobeUI::GetUserImageScreenActor() {
   return user_image_screen_actor_;
 }
@@ -439,6 +433,7 @@ void OobeUI::InitializeScreenMaps() {
   screen_names_[SCREEN_APP_LAUNCH_SPLASH] = kScreenAppLaunchSplash;
   screen_names_[SCREEN_CONFIRM_PASSWORD] = kScreenConfirmPassword;
   screen_names_[SCREEN_FATAL_ERROR] = kScreenFatalError;
+  screen_names_[SCREEN_OOBE_CONTROLLER_PAIRING] = kScreenControllerPairing;
 
   screen_ids_.clear();
   for (size_t i = 0; i < screen_names_.size(); ++i)