Turning on MultiProfile by default for ChromeOS

chrome/browser/ui/ash/chrome_shell_delegate.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/ui/ash/chrome_shell_delegate.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "ash/content_support/gpu_support_impl.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "base/command_line.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
 // static
 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
 
 ChromeShellDelegate::ChromeShellDelegate()
     : shelf_delegate_(NULL) {
   instance_ = this;
   PlatformInit();
 }
 
 ChromeShellDelegate::~ChromeShellDelegate() {
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
-  // TODO(skuhne): There is a function named profiles::IsMultiProfilesEnabled
-  // which does similar things - but it is not the same. We should investigate
-  // if these two could be folded together.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))
+  if (!profiles::IsMultipleProfilesEnabled())
     return false;
 #if defined(OS_CHROMEOS)
   // If there is a user manager, we need to see that we can at least have 2
   // simultaneous users to allow this feature.
   if (!chromeos::UserManager::IsInitialized())
     return false;
   size_t admitted_users_to_be_added =
       chromeos::UserManager::Get()->GetUsersAdmittedForMultiProfile().size();
   size_t logged_in_users =
       chromeos::UserManager::Get()->GetLoggedInUsers().size();
@@ skipping 100 matching lines @@
 
 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.AddObserver(observer);
 }
 
 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.RemoveObserver(observer);
 }