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/ui/webui/help/version_updater_chromeos.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/ui/webui/help/version_updater_chromeos.cc')
| -rw-r--r-- | chrome/browser/ui/webui/help/version_updater_chromeos.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc index e6c2f2a..ac87357 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc @@ -10,7 +10,6 @@ #include "base/bind_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/startup_utils.h" -#include "chrome/browser/chromeos/login/users/user_manager.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" @@ -20,6 +19,7 @@ #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/settings/cros_settings_names.h" +#include "components/user_manager/user_manager.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -28,7 +28,7 @@ using chromeos::CrosSettings; using chromeos::DBusThreadManager; using chromeos::UpdateEngineClient; -using chromeos::UserManager; +using user_manager::UserManager; using chromeos::WizardController; namespace { @@ -128,7 +128,7 @@ void VersionUpdaterCros::RelaunchBrowser() const { void VersionUpdaterCros::SetChannel(const std::string& channel, bool is_powerwash_allowed) { - if (UserManager::Get()->IsCurrentUserOwner()) { + if (user_manager::UserManager::Get()->IsCurrentUserOwner()) { // For local owner set the field in the policy blob. CrosSettings::Get()->SetString(chromeos::kReleaseChannel, channel); } |