Remove HostDesktopType from profiles

chrome/browser/ui/webui/options/create_profile_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/create_profile_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 92 matching lines @@
   }
   std::string supervised_user_id;
 #if defined(ENABLE_SUPERVISED_USERS)
   if (!ProcessSupervisedCreateProfileArgs(args, &supervised_user_id))
     return;
 #endif
 
   ProfileMetrics::LogProfileAddNewUser(ProfileMetrics::ADD_NEW_USER_DIALOG);
 
   profile_path_being_created_ = ProfileManager::CreateMultiProfileAsync(
-      name, icon_url,
-      base::Bind(&CreateProfileHandler::OnProfileCreated,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 create_shortcut,
-                 helper::GetDesktopType(web_ui()),
-                 supervised_user_id),
+      name, icon_url, base::Bind(&CreateProfileHandler::OnProfileCreated,
+                                 weak_ptr_factory_.GetWeakPtr(),
+                                 create_shortcut, supervised_user_id),
       supervised_user_id);
 }
 
 void CreateProfileHandler::OnProfileCreated(
     bool create_shortcut,
-    chrome::HostDesktopType desktop_type,
     const std::string& supervised_user_id,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_CREATED)
     RecordProfileCreationMetrics(status);
 
   switch (status) {
     case Profile::CREATE_STATUS_LOCAL_FAIL: {
       ShowProfileCreationError(profile, GetProfileCreationErrorMessageLocal());
       break;
     }
     case Profile::CREATE_STATUS_CREATED: {
       // Do nothing for an intermediate status.
       break;
     }
     case Profile::CREATE_STATUS_INITIALIZED: {
-      HandleProfileCreationSuccess(create_shortcut, desktop_type,
-                                   supervised_user_id, profile);
+      HandleProfileCreationSuccess(create_shortcut, supervised_user_id,
+                                   profile);
       break;
     }
     // User-initiated cancellation is handled in CancelProfileRegistration and
     // does not call this callback.
     case Profile::CREATE_STATUS_CANCELED:
     // Supervised user registration errors are handled in
     // OnSupervisedUserRegistered().
     case Profile::CREATE_STATUS_REMOTE_FAIL:
     case Profile::MAX_CREATE_STATUS: {
       NOTREACHED();
       break;
     }
   }
 }
 
 void CreateProfileHandler::HandleProfileCreationSuccess(
     bool create_shortcut,
-    chrome::HostDesktopType desktop_type,
     const std::string& supervised_user_id,
     Profile* profile) {
   switch (profile_creation_type_) {
     case NON_SUPERVISED_PROFILE_CREATION: {
       DCHECK(supervised_user_id.empty());
-      CreateShortcutAndShowSuccess(create_shortcut, desktop_type, profile);
+      CreateShortcutAndShowSuccess(create_shortcut, profile);
       break;
     }
 #if defined(ENABLE_SUPERVISED_USERS)
     case SUPERVISED_PROFILE_CREATION:
     case SUPERVISED_PROFILE_IMPORT:
-      RegisterSupervisedUser(create_shortcut, desktop_type,
-                             supervised_user_id, profile);
+      RegisterSupervisedUser(create_shortcut, supervised_user_id, profile);
       break;
 #endif
     case NO_CREATION_IN_PROGRESS:
       NOTREACHED();
       break;
   }
 }
 
-void CreateProfileHandler::CreateShortcutAndShowSuccess(
-    bool create_shortcut,
-    chrome::HostDesktopType desktop_type,
-    Profile* profile) {
+void CreateProfileHandler::CreateShortcutAndShowSuccess(bool create_shortcut,
+                                                        Profile* profile) {
   if (create_shortcut) {
     ProfileShortcutManager* shortcut_manager =
         g_browser_process->profile_manager()->profile_shortcut_manager();
 
     if (shortcut_manager)
       shortcut_manager->CreateProfileShortcut(profile->GetPath());
   }
 
   DCHECK_EQ(profile_path_being_created_.value(), profile->GetPath().value());
   profile_path_being_created_.clear();
@@ skipping 18 matching lines @@
   // the new window now.
   bool should_open_new_window = true;
 #if defined(ENABLE_SUPERVISED_USERS)
   if (profile_creation_type_ == SUPERVISED_PROFILE_CREATION)
     should_open_new_window = false;
 #endif
 
   if (should_open_new_window) {
     // Opening the new window must be the last action, after all callbacks
     // have been run, to give them a chance to initialize the profile.
-    helper::OpenNewWindowForProfile(desktop_type,
-                                    profile,
+    helper::OpenNewWindowForProfile(profile,
                                     Profile::CREATE_STATUS_INITIALIZED);
   }
   profile_creation_type_ = NO_CREATION_IN_PROGRESS;
 }
 
 void CreateProfileHandler::ShowProfileCreationError(
     Profile* profile,
     const base::string16& error) {
   DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_);
   profile_creation_type_ = NO_CREATION_IN_PROGRESS;
@@ skipping 142 matching lines @@
   profile_creation_type_ = NO_CREATION_IN_PROGRESS;
 
   // Cancelling registration means the callback passed into
   // RegisterAndInitSync() won't be called, so the cleanup must be done here.
   profile_path_being_created_.clear();
   helper::DeleteProfileAtPath(new_profile->GetPath(), web_ui());
 }
 
 void CreateProfileHandler::RegisterSupervisedUser(
     bool create_shortcut,
-    chrome::HostDesktopType desktop_type,
     const std::string& supervised_user_id,
     Profile* new_profile) {
   DCHECK_EQ(profile_path_being_created_.value(),
             new_profile->GetPath().value());
 
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(new_profile);
 
   // Register the supervised user using the profile of the custodian.
   supervised_user_registration_utility_ =
       SupervisedUserRegistrationUtility::Create(Profile::FromWebUI(web_ui()));
   supervised_user_service->RegisterAndInitSync(
       supervised_user_registration_utility_.get(),
       Profile::FromWebUI(web_ui()),
       supervised_user_id,
       base::Bind(&CreateProfileHandler::OnSupervisedUserRegistered,
                  weak_ptr_factory_.GetWeakPtr(),
                  create_shortcut,
-                 desktop_type,
                  new_profile));
 }
 
 void CreateProfileHandler::OnSupervisedUserRegistered(
     bool create_shortcut,
-    chrome::HostDesktopType desktop_type,
     Profile* profile,
     const GoogleServiceAuthError& error) {
   GoogleServiceAuthError::State state = error.state();
   RecordSupervisedProfileCreationMetrics(state);
   if (state == GoogleServiceAuthError::NONE) {
-    CreateShortcutAndShowSuccess(create_shortcut, desktop_type, profile);
+    CreateShortcutAndShowSuccess(create_shortcut, profile);
     return;
   }
 
   base::string16 error_msg;
   if (state == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
       state == GoogleServiceAuthError::USER_NOT_SIGNED_UP ||
       state == GoogleServiceAuthError::ACCOUNT_DELETED ||
       state == GoogleServiceAuthError::ACCOUNT_DISABLED) {
     error_msg = GetProfileCreationErrorMessageSignin();
   } else {
@@ skipping 47 matching lines @@
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (existing_supervised_user_id ==
             cache.GetSupervisedUserIdOfProfileAtIndex(i))
       return false;
   }
   return true;
 }
 #endif
 
 }  // namespace options