diff options
| author | skobes@chromium.org <skobes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 18:27:06 +0000 |
|---|---|---|
| committer | skobes@chromium.org <skobes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 18:27:06 +0000 |
| commit | d79b6fe0088357db47dd5f09b62776ade84a8362 (patch) | |
| tree | 4fdc287cfa8d0bda9e8669b32366d84a8b9a07fb /components/user_manager | |
| parent | dd1c2a75d2dacd95526ec21ab765098fd931def8 (diff) | |
| download | chromium_src-d79b6fe0088357db47dd5f09b62776ade84a8362.zip chromium_src-d79b6fe0088357db47dd5f09b62776ade84a8362.tar.gz chromium_src-d79b6fe0088357db47dd5f09b62776ade84a8362.tar.bz2 | |
Revert 286187 "user_manager component: Add UserManagerBase class."
Breaks PreferencesTest.MultiProfiles:
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/2299
[311:311:0729/081921:FATAL:user_manager.cc(69)] Check failed: g_user_manager.
> user_manager component: Add UserManagerBase class.
>
> UserManagerBase contains common methods extracted from UserManagerImpl.
> UserManagerImpl was renamed to ChromeUserManager and inherits UserManagerBase.
>
> Misc refactoring:
> * Move HasBrowserStarted() to SessionManager
> * Add generic getter SessionManager::Get() which makes it possible for concrete clients don't depend on instance ownership like g_browser_process->platform_part()->SessionManager().
> * Moved CRLSet code out of UserManager::UserLoggedIn(), to UserSessionManager.
>
> BUG=387614
>
> Review URL: https://codereview.chromium.org/417623002
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/424193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/user_manager')
| -rw-r--r-- | components/user_manager/user.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/user_manager/user.h b/components/user_manager/user.h index ae09573..60ed45a 100644 --- a/components/user_manager/user.h +++ b/components/user_manager/user.h @@ -18,14 +18,13 @@ #include "ui/gfx/image/image_skia.h" namespace chromeos { -class ChromeUserManager; class FakeLoginUtils; class FakeUserManager; class MockUserManager; class SupervisedUserManagerImpl; class UserAddingScreenTest; class UserImageManagerImpl; -class UserManagerBase; +class UserManagerImpl; class UserSessionManager; } @@ -149,10 +148,9 @@ class USER_MANAGER_EXPORT User : public UserInfo { bool is_profile_created() const { return profile_is_created_; } protected: - friend class chromeos::ChromeUserManager; friend class chromeos::SupervisedUserManagerImpl; + friend class chromeos::UserManagerImpl; friend class chromeos::UserImageManagerImpl; - friend class chromeos::UserManagerBase; friend class chromeos::UserSessionManager; // For testing: |