diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 09:22:58 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 09:24:19 +0000 |
| commit | 4d3907860d4d46a98f07c59ba69125be0faab404 (patch) | |
| tree | 305014dd85fd28832ebc1b5acda4865747583241 /apps/launcher.cc | |
| parent | 502c06e7deef18b28a0795222521aeffe83c209d (diff) | |
| download | chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.zip chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.tar.gz chromium_src-4d3907860d4d46a98f07c59ba69125be0faab404.tar.bz2 | |
[cros] user_manager component - move UserManagerBase and UserManager
* Move UserManager test helper classes in their own files
* Move RemoveUserDelegate to user_manager component
* Move UserManager ownership to BrowserProcessPlatformPart
* UserManager::Get() still stays but instance is explicitly initialized/cleared with instance->Initialize()|Destroy()
* ScopedUserManagerEnabler / ScopedTestUserManager classes still work
* Introduce ChromeUserManager base class (impl: ChromeUserManagerImpl)
* ChromeUserManager adds getters for MultiProfileUserController, UserImageManager, SupervisedUserManager.
All clients that were using these methods now access ChromeUserManager instance through ChromeUserManager::Get().
* FakeUserManager/MockUserManager implement ChromeUserManager
* Move *UserFlow() methods out of UserManager to ChromeUserManager
BUG=387614
TBR=thestig,benwells
Review URL: https://codereview.chromium.org/444903002
Cr-Commit-Position: refs/heads/master@{#289827}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/launcher.cc')
| -rw-r--r-- | apps/launcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/launcher.cc b/apps/launcher.cc index ca463de..aabbc64 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -4,8 +4,8 @@ #include "apps/launcher.h" -#include <utility> #include <set> +#include <utility> #include "base/command_line.h" #include "base/file_util.h" @@ -40,7 +40,7 @@ #include "url/gurl.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "components/user_manager/user_manager.h" #endif namespace app_runtime = extensions::core_api::app_runtime; @@ -318,7 +318,7 @@ void LaunchPlatformAppWithCommandLine(Profile* profile, if (extensions::KioskModeInfo::IsKioskOnly(extension)) { bool in_kiosk_mode = false; #if defined(OS_CHROMEOS) - chromeos::UserManager* user_manager = chromeos::UserManager::Get(); + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp(); #endif if (!in_kiosk_mode) { |