Support for auth code based authentication flow for both app and web UI driven flow.

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 af6370d5e9dcf57dd855cfc7235e9c0496f5ee0e..af5dbc8f4bbefbfc05dbe04a14c13068894a9205 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -772,6 +772,9 @@ void SigninScreenHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("completeLogin",
       base::Bind(&SigninScreenHandler::HandleCompleteLogin,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("completeAuthentication",
+      base::Bind(&SigninScreenHandler::HandleCompleteAuthentication,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getUsers",
       base::Bind(&SigninScreenHandler::HandleGetUsers,
                  base::Unretained(this)));
@@ -1163,7 +1166,31 @@ void SigninScreenHandler::HandleCompleteLogin(const base::ListValue* args) {
 
   typed_email = gaia::SanitizeEmail(typed_email);
   delegate_->SetDisplayEmail(typed_email);
-  delegate_->CompleteLogin(typed_email, password);
+  delegate_->CompleteLogin(UserCredentials(typed_email,
+                                           password,
+                                           std::string()));  // auth_code
+}
+
+void SigninScreenHandler::HandleCompleteAuthentication(
+    const base::ListValue* args) {
+  if (!delegate_)
+    return;
+
+  std::string email;
+  std::string password;
+  std::string auth_code;
+  if (!args->GetString(0, &email) ||
+      !args->GetString(1, &password) ||
+      !args->GetString(2, &auth_code)) {
+    NOTREACHED();
+    return;
+  }
+
+  email = gaia::SanitizeEmail(email);
+  delegate_->SetDisplayEmail(email);
+  delegate_->CompleteLogin(UserCredentials(email,
+                                           password,
+                                           auth_code));
 }
 
 void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
@@ -1179,7 +1206,9 @@ void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
   }
 
   username = gaia::SanitizeEmail(username);
-  delegate_->Login(username, password);
+  delegate_->Login(UserCredentials(username,
+                                   password,
+                                   std::string()));  // auth_code
 }
 
 void SigninScreenHandler::HandleLaunchDemoUser(const base::ListValue* args) {