Consumer management enrollment signin screen change:

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

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 8c8f4bf32b3424be11803bfa74225bc3c6f5cef8..4b7c2d8345b30092010d059d9c142d1b4dd07452 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ -35,6 +36,7 @@
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
+#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -52,6 +54,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/ime/ime_keyboard.h"
@@ -297,6 +300,14 @@ SigninScreenHandler::SigninScreenHandler(
       chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
   if (keyboard)
     keyboard->AddObserver(this);
+
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  PrefService* prefs = g_browser_process->local_state();
+  is_enrolling_consumer_management_ =
+      command_line->HasSwitch(chromeos::switches::kEnableConsumerManagement) &&
+      prefs->GetBoolean(prefs::kConsumerManagementEnrollmentRequested);
+
+  CrosSettings::Get()->GetString(kDeviceOwner, &owner_email_);

[Nikita (slow), 2014/07/31 10:03:43]

CrosSettings need to be verified first like here:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

However for your particular case it maybe fine to use cached version.
You should add additional checks after owner signs in that it's indeed owner
(since user may change prefilled value) and that CrosSettings values are
trusted.

[davidyu, 2014/08/01 07:07:23]

I updated the code so that the untrusted value is not saved, and added a comment
explaining why it is good enough to use the untrusted value. After signing in, I
will use the value from UserManager to verify the authenticated email.

 }
 
 SigninScreenHandler::~SigninScreenHandler() {
@@ -420,7 +431,8 @@ void SigninScreenHandler::Show(const LoginScreenContext& context) {
 
   // Just initialize internal fields from context and call ShowImpl().
   oobe_ui_ = context.oobe_ui();
-  gaia_screen_handler_->PopulateEmail(context.email());
+  gaia_screen_handler_->PopulateEmail(
+      is_enrolling_consumer_management_ ? owner_email_ : context.email());
   ShowImpl();
 }
 
@@ -459,7 +471,7 @@ void SigninScreenHandler::ShowImpl() {
     return;
   }
 
-  if (oobe_ui_) {
+  if (oobe_ui_ || is_enrolling_consumer_management_) {
     // Shows new user sign-in for OOBE.
     OnShowAddUser();
   } else {
@@ -751,6 +763,8 @@ void SigninScreenHandler::RegisterMessages() {
               &SigninScreenHandler::HandleRetrieveAuthenticatedUserEmail);
   AddCallback("getPublicSessionKeyboardLayouts",
               &SigninScreenHandler::HandleGetPublicSessionKeyboardLayouts);
+  AddCallback("cancelConsumerManagementEnrollment",
+              &SigninScreenHandler::HandleCancelConsumerManagementEnrollment);
 
 
   // This message is sent by the kiosk app menu, but is handled here
@@ -1308,6 +1322,13 @@ void SigninScreenHandler::HandleLaunchKioskApp(const std::string& app_id,
     delegate_->Login(context, specifics);
 }
 
+void SigninScreenHandler::HandleCancelConsumerManagementEnrollment() {
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetBoolean(prefs::kConsumerManagementEnrollmentRequested, false);
+  is_enrolling_consumer_management_ = false;
+  ShowImpl();
+}
+
 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
@@ -1413,7 +1434,7 @@ void SigninScreenHandler::ContinueKioskEnableFlow(
 void SigninScreenHandler::OnShowAddUser() {
   is_account_picker_showing_first_time_ = false;
   DCHECK(gaia_screen_handler_);
-  gaia_screen_handler_->ShowGaia();
+  gaia_screen_handler_->ShowGaia(is_enrolling_consumer_management_);
 }
 
 GaiaScreenHandler::FrameState SigninScreenHandler::FrameState() const {