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 /chrome/browser/extensions/api/input/input.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 'chrome/browser/extensions/api/input/input.cc')
| -rw-r--r-- | chrome/browser/extensions/api/input/input.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/input/input.cc b/chrome/browser/extensions/api/input/input.cc index a3939ad..b9f4b1e 100644 --- a/chrome/browser/extensions/api/input/input.cc +++ b/chrome/browser/extensions/api/input/input.cc @@ -21,7 +21,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/lock/screen_locker.h" #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" +#include "components/user_manager/user_manager.h" #endif // OS_CHROMEOS #if defined(USE_ASH) @@ -177,10 +177,10 @@ bool VirtualKeyboardPrivateOpenSettingsFunction::RunSync() { #if defined(OS_CHROMEOS) // Do not try to open language options page if user is not logged in or // locked. - if (!chromeos::UserManager::Get()->IsUserLoggedIn() || + if (!user_manager::UserManager::Get()->IsUserLoggedIn() || chromeos::UserAddingScreen::Get()->IsRunning() || (chromeos::ScreenLocker::default_screen_locker() && - chromeos::ScreenLocker::default_screen_locker()->locked())) + chromeos::ScreenLocker::default_screen_locker()->locked())) return true; #endif // OS_CHROMEOS |