| Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| index bbcaa5d9317fa4493a343038d1df14e2a60e0574..4f6ffe321e8c8e1c7d18e3b630ac28b61c7b02ac 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -10,10 +10,10 @@
|
| #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"
|
| @@ -21,7 +21,6 @@
|
| #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"
|
| @@ -48,10 +47,7 @@ ChromeShellDelegate::~ChromeShellDelegate() {
|
| }
|
|
|
| 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
|
|
|