Add error handling for supervised user import flow.

chrome/browser/ui/webui/options/managed_user_import_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/managed_user_import_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
@@ skipping 41 matching lines @@
 
 void ManagedUserImportHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
       { "managedUserImportTitle", IDS_IMPORT_EXISTING_MANAGED_USER_TITLE },
       { "managedUserImportText", IDS_IMPORT_EXISTING_MANAGED_USER_TEXT },
       { "createNewUserLink", IDS_CREATE_NEW_USER_LINK },
       { "managedUserImportOk", IDS_IMPORT_EXISTING_MANAGED_USER_OK },
+      { "managedUserImportSigninError", IDS_MANAGED_USER_IMPORT_SIGN_IN_ERROR },
       { "managedUserAlreadyOnThisDevice",
           IDS_MANAGED_USER_ALREADY_ON_THIS_DEVICE },
       { "noExistingManagedUsers", IDS_MANAGED_USER_NO_EXISTING_ERROR },
       { "managedUserSelectAvatarTitle", IDS_MANAGED_USER_SELECT_AVATAR_TITLE },
       { "managedUserSelectAvatarText", IDS_MANAGED_USER_SELECT_AVATAR_TEXT },
       { "managedUserSelectAvatarOk", IDS_MANAGED_USER_SELECT_AVATAR_OK },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   localized_strings->Set("avatarIcons", GetAvatarIcons().release());
@@ skipping 28 matching lines @@
 }
 
 void ManagedUserImportHandler::RequestManagedUserImportUpdate(
     const base::ListValue* /* args */) {
   if (Profile::FromWebUI(web_ui())->IsManaged())
     return;
 
   if (!IsAccountConnected() || HasAuthError()) {
     ClearManagedUsersAndShowError();
   } else {
-    // Account connected and no sign-in errors, then hide
-    // any error messages and send the managed users to update
-    // the managed user list.
-    web_ui()->CallJavascriptFunction(
-        "ManagedUserImportOverlay.hideErrorBubble");
-
     ManagedUserSyncService* managed_user_sync_service =
         ManagedUserSyncServiceFactory::GetForProfile(
             Profile::FromWebUI(web_ui()));
     managed_user_sync_service->GetManagedUsersAsync(
         base::Bind(&ManagedUserImportHandler::SendExistingManagedUsers,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void ManagedUserImportHandler::SendExistingManagedUsers(
@@ skipping 34 matching lines @@
             ProfileInfoCache::GetDefaultAvatarIconUrl(avatar_index);
     managed_user->SetString("iconURL", avatar_url);
     bool on_current_device =
         managed_user_ids.find(it.key()) != managed_user_ids.end();
     managed_user->SetBoolean("onCurrentDevice", on_current_device);
 
     managed_users.Append(managed_user);
   }
 
   web_ui()->CallJavascriptFunction(
-      "ManagedUserImportOverlay.receiveExistingManagedUsers",
+      "options.ManagedUserListData.receiveExistingManagedUsers",
       managed_users);
 }
 
 void ManagedUserImportHandler::ClearManagedUsersAndShowError() {
-  web_ui()->CallJavascriptFunction(
-      "ManagedUserImportOverlay.receiveExistingManagedUsers");
-  base::string16 error_message =
-      l10n_util::GetStringUTF16(IDS_MANAGED_USER_IMPORT_SIGN_IN_ERROR);
-  web_ui()->CallJavascriptFunction("ManagedUserImportOverlay.onError",
-                                   base::StringValue(error_message));
+  web_ui()->CallJavascriptFunction("options.ManagedUserListData.onSigninError");
 }
 
 bool ManagedUserImportHandler::IsAccountConnected() const {
   Profile* profile = Profile::FromWebUI(web_ui());
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   return !signin_manager->GetAuthenticatedUsername().empty();
 }
 
 bool ManagedUserImportHandler::HasAuthError() const {
   Profile* profile = Profile::FromWebUI(web_ui());
   SigninGlobalError* signin_global_error =
       SigninGlobalError::GetForProfile(profile);
   GoogleServiceAuthError::State state =
       signin_global_error->GetLastAuthError().state();
 
   return state == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
       state == GoogleServiceAuthError::USER_NOT_SIGNED_UP ||
       state == GoogleServiceAuthError::ACCOUNT_DELETED ||
       state == GoogleServiceAuthError::ACCOUNT_DISABLED;
 }
 
 }  // namespace options