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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 592893002: Rename ScreelockBridge to SigninScreenBridge Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_auth_handler
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_screen_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index 2bf00ba424ce9472019e4db2de50343c7c3b5025..d3d8746dcd5b1f88ffcdcbaabd9ad3978e1592b4 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -224,7 +224,7 @@ UserManagerScreenHandler::UserManagerScreenHandler()
}
UserManagerScreenHandler::~UserManagerScreenHandler() {
- ScreenlockBridge::Get()->SetLockHandler(NULL);
+ SigninScreenBridge::Get()->SetLockHandler(NULL);
}
void UserManagerScreenHandler::ShowBannerMessage(
@@ -236,7 +236,7 @@ void UserManagerScreenHandler::ShowBannerMessage(
void UserManagerScreenHandler::ShowUserPodCustomIcon(
const std::string& user_email,
- const ScreenlockBridge::UserPodCustomIconOptions& icon_options) {
+ const SigninScreenBridge::UserPodCustomIconOptions& icon_options) {
scoped_ptr<base::DictionaryValue> icon = icon_options.ToDictionaryValue();
if (!icon || icon->empty())
return;
@@ -259,10 +259,10 @@ void UserManagerScreenHandler::EnableInput() {
void UserManagerScreenHandler::SetAuthType(
const std::string& user_email,
- ScreenlockBridge::LockHandler::AuthType auth_type,
+ SigninScreenBridge::LockHandler::AuthType auth_type,
const base::string16& auth_value) {
if (GetAuthType(user_email) ==
- ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
+ SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
return;
user_auth_type_map_[user_email] = auth_type;
@@ -273,11 +273,11 @@ void UserManagerScreenHandler::SetAuthType(
base::StringValue(auth_value));
}
-ScreenlockBridge::LockHandler::AuthType UserManagerScreenHandler::GetAuthType(
+SigninScreenBridge::LockHandler::AuthType UserManagerScreenHandler::GetAuthType(
const std::string& user_email) const {
UserAuthTypeMap::const_iterator it = user_auth_type_map_.find(user_email);
if (it == user_auth_type_map_.end())
- return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
+ return SigninScreenBridge::LockHandler::OFFLINE_PASSWORD;
return it->second;
}
@@ -307,7 +307,7 @@ void UserManagerScreenHandler::HandleInitialize(const base::ListValue* args) {
desktop_type_ = chrome::GetHostDesktopTypeForNativeView(
web_ui()->GetWebContents()->GetNativeView());
- ScreenlockBridge::Get()->SetLockHandler(this);
+ SigninScreenBridge::Get()->SetLockHandler(this);
}
void UserManagerScreenHandler::HandleAddUser(const base::ListValue* args) {
@@ -457,7 +457,7 @@ void UserManagerScreenHandler::HandleHardlockUserPod(
std::string email;
CHECK(args->GetString(0, &email));
SetAuthType(email,
- ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD,
+ SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD,
base::string16());
HideUserPodCustomIcon(email);
}
« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_screen_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698