Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1227)

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index f7a12e742c6babb30e33ea091eb32e1d5b818f65..ececc37daddef0732cf6bd6e26c1cc90189da896 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -19,6 +19,7 @@
#include "chromeos/ime/ime_keyboard.h"
#include "chromeos/ime/input_method_manager.h"
#include "chromeos/login/user_names.h"
+#include "components/user_manager/user_manager.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/views/widget/widget.h"
#include "ui/wm/core/user_activity_detector.h"
@@ -122,7 +123,7 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
// Allow this call only before user sign in or at lock screen.
// If this call is made after new user signs in but login screen is still
// around that would trigger a sign in extension refresh.
- if (is_enabled && (!UserManager::Get()->IsUserLoggedIn() ||
+ if (is_enabled && (!user_manager::UserManager::Get()->IsUserLoggedIn() ||
ScreenLocker::default_screen_locker())) {
ClearAndEnablePassword();
}
@@ -277,7 +278,7 @@ void WebUILoginDisplay::OnSigninScreenReady() {
}
void WebUILoginDisplay::RemoveUser(const std::string& username) {
- UserManager::Get()->RemoveUser(username, this);
+ user_manager::UserManager::Get()->RemoveUser(username, this);
}
void WebUILoginDisplay::ResyncUserData() {
« no previous file with comments | « chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/user_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698