Turning on MultiProfile by default for ChromeOS

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 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/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 65 matching lines @@
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 223 matching lines @@
 #else
   return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
       profile_manager->user_data_dir());
 #endif
 }
 
 // static
 Profile* ProfileManager::GetActiveUserProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 #if defined(OS_CHROMEOS)
-  if (!chromeos::UserManager::IsMultipleProfilesAllowed() ||
-      !profile_manager->IsLoggedIn() ||
-      !chromeos::UserManager::IsInitialized())
+  if (!profile_manager->IsLoggedIn() ||
+      !chromeos::UserManager::IsInitialized()) {
     return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
         profile_manager->user_data_dir());
+  }
+
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   const chromeos::User* user = manager->GetActiveUser();
   // To avoid an endless loop (crbug.com/334098) we have to additionally check
   // if the profile of the user was already created. If the profile was not yet
   // created we load the profile using the profile directly.
   // TODO: This should be cleaned up with the new profile manager.
   if (user && user->is_profile_created())
     return manager->GetProfileByUser(user);
 #endif
   return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
@@ skipping 103 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (logged_in_) {
     base::FilePath profile_dir;
     // If the user has logged in, pick up the new profile.
     if (command_line.HasSwitch(chromeos::switches::kLoginProfile)) {
       // TODO(nkostylev): Remove this code completely once we eliminate
       // legacy --login-profile=user switch and enable multi-profiles on CrOS
       // by default. http://crbug.com/294628
       profile_dir = chromeos::ProfileHelper::
           GetProfileDirByLegacyLoginProfileSwitch();
-    } else if (!command_line.HasSwitch(switches::kMultiProfiles)) {
-      // We should never be logged in with no profile dir unless
-      // multi-profiles are enabled.
-      // In that case profile dir will be defined by user_id hash.
-      NOTREACHED();
-      return base::FilePath("");
     }
     // In case of multi-profiles ignore --login-profile switch.
     // TODO(nkostylev): Some cases like Guest mode will have empty username_hash
     // so default kLoginProfile dir will be used.
     std::string user_id_hash = g_browser_process->platform_part()->
         profile_helper()->active_user_id_hash();
-    if (command_line.HasSwitch(switches::kMultiProfiles) &&
-        !user_id_hash.empty()) {
+    if (!user_id_hash.empty()) {
       profile_dir = g_browser_process->platform_part()->
           profile_helper()->GetActiveUserProfileDir();
     }
     relative_profile_dir = relative_profile_dir.Append(profile_dir);
     return relative_profile_dir;
   }
 #endif
   // TODO(mirandac): should not automatically be default profile.
   relative_profile_dir =
       relative_profile_dir.AppendASCII(chrome::kInitialProfile);
   return relative_profile_dir;
 }
 
 Profile* ProfileManager::GetLastUsedProfile(
     const base::FilePath& user_data_dir) {
 #if defined(OS_CHROMEOS)
   // Use default login profile if user has not logged in yet.
   if (!logged_in_) {
     return GetActiveUserOrOffTheRecordProfileFromPath(user_data_dir);
   } else {
     // CrOS multi-profiles implementation is different so GetLastUsedProfile
     // has custom implementation too.
     base::FilePath profile_dir;
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (command_line.HasSwitch(switches::kMultiProfiles)) {
-      // In case of multi-profiles we ignore "last used profile" preference
-      // since it may refer to profile that has been in use in previous session.
-      // That profile dir may not be mounted in this session so instead return
-      // active profile from current session.
-      profile_dir = g_browser_process->platform_part()->
-          profile_helper()->GetActiveUserProfileDir();
-    } else {
-      // For legacy (not multi-profiles) implementation always default to
-      // --login-profile value.
-      profile_dir =
-          chromeos::ProfileHelper::GetProfileDirByLegacyLoginProfileSwitch();
-    }
+    // In case of multi-profiles we ignore "last used profile" preference
+    // since it may refer to profile that has been in use in previous session.
+    // That profile dir may not be mounted in this session so instead return
+    // active profile from current session.
+    profile_dir = g_browser_process->platform_part()->
+        profile_helper()->GetActiveUserProfileDir();
 
     base::FilePath profile_path(user_data_dir);
     Profile* profile = GetProfile(profile_path.Append(profile_dir));
     return profile->IsGuestSession() ? profile->GetOffTheRecordProfile() :
                                        profile;
   }
 #endif
 
   return GetProfile(GetLastUsedProfileDir(user_data_dir));
 }
@@ skipping 768 matching lines @@
           last_non_managed_profile_path.BaseName().MaybeAsASCII());
       FinishDeletingProfile(profile_to_delete_path);
     }
   }
 }
 #endif
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }