Pass errors generated during limited-user registration up to the UI for display.

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

 // Copyright (c) 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/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 85 matching lines @@
         IDS_PROFILES_CREATE_LIMITED_NOT_SIGNED_IN_LABEL },
     { "manageProfilesLimitedNotSignedInLink",
         IDS_PROFILES_CREATE_LIMITED_NOT_SIGNED_IN_LINK },
     { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
     { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
     { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
     { "createProfileTitle", IDS_PROFILES_CREATE_TITLE },
     { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS },
     { "createProfileConfirm", IDS_PROFILES_CREATE_CONFIRM },
     { "createProfileLocalError", IDS_PROFILES_CREATE_LOCAL_ERROR },
+    { "createProfileRemoteError", IDS_PROFILES_CREATE_REMOTE_ERROR },
     { "createProfileShortcut", IDS_PROFILES_CREATE_SHORTCUT },
     { "removeProfileShortcut", IDS_PROFILES_REMOVE_SHORTCUT },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "manageProfile",
                 IDS_PROFILES_MANAGE_TITLE);
   RegisterTitle(localized_strings, "createProfile",
                 IDS_PROFILES_CREATE_TITLE);
 
   localized_strings->SetBoolean("profileShortcutsEnabled",
                                 ProfileShortcutManager::IsFeatureEnabled());
   localized_strings->SetBoolean("managedUsersEnabled",
                                 ManagedUserService::AreManagedUsersEnabled());
 }
 
 void ManageProfileHandler::InitializeHandler() {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  content::NotificationService::AllSources());
 }
 
 void ManageProfileHandler::InitializePage() {
   SendProfileNames();
 }
 
 void ManageProfileHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("setProfileNameAndIcon",
       base::Bind(&ManageProfileHandler::SetProfileNameAndIcon,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("deleteProfile",
-      base::Bind(&ManageProfileHandler::DeleteProfile,
-                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestDefaultProfileIcons",
       base::Bind(&ManageProfileHandler::RequestDefaultProfileIcons,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestNewProfileDefaults",
       base::Bind(&ManageProfileHandler::RequestNewProfileDefaults,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestHasProfileShortcuts",
       base::Bind(&ManageProfileHandler::RequestHasProfileShortcuts,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestSignedInText",
@@ skipping 160 matching lines @@
     ProfileMetrics::LogProfileAvatarSelection(new_icon_index);
     PrefService* pref_service = profile->GetPrefs();
     // Updating the profile preference will cause the cache to be updated for
     // this preference.
     pref_service->SetInteger(prefs::kProfileAvatarIndex, new_icon_index);
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
   }
   ProfileMetrics::LogProfileUpdate(profile_file_path);
 }
 
-void ManageProfileHandler::DeleteProfile(const ListValue* args) {
-  DCHECK(args);
-#if defined(ENABLE_MANAGED_USERS)
-  // This handler could have been called in managed mode, for example because
-  // the user fiddled with the web inspector. Silently return in this case.
-  ManagedUserService* service =
-      ManagedUserServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()));
-  if (service->ProfileIsManaged())
-    return;
-#endif
-
-  if (!ProfileManager::IsMultipleProfilesEnabled())
-    return;
-
-  ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::PROFILE_DELETED);
-
-  base::FilePath profile_file_path;
-  if (!GetProfilePathFromArgs(args, &profile_file_path))
-    return;
-
-  Browser* browser =
-      chrome::FindBrowserWithWebContents(web_ui()->GetWebContents());
-  chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
-  if (browser)
-    desktop_type = browser->host_desktop_type();
-
-  g_browser_process->profile_manager()->ScheduleProfileForDeletion(
-      profile_file_path,
-      base::Bind(&OnNewDefaultProfileCreated, desktop_type));
-}
-
 #if defined(ENABLE_SETTINGS_APP)
 void ManageProfileHandler::SwitchAppListProfile(const ListValue* args) {
   DCHECK(args);
   DCHECK(ProfileManager::IsMultipleProfilesEnabled());
 
   const Value* file_path_value;
   base::FilePath profile_file_path;
   if (!args->Get(0, &file_path_value) ||
       !base::GetValueAsFilePath(*file_path_value, &profile_file_path))
     return;
@@ skipping 110 matching lines @@
     g_browser_process->profile_manager()->profile_shortcut_manager();
   DCHECK(shortcut_manager);
 
   shortcut_manager->RemoveProfileShortcuts(profile_file_path);
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 }  // namespace options