| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| index acbaa902e7dce821763becf8d6b8edad79a920a5..22aabffe8776ee04472b43220319a510544f71ce 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -326,8 +326,8 @@ SigninScreenHandler::~SigninScreenHandler() {
|
| max_mode_delegate_->RemoveObserver(this);
|
| max_mode_delegate_.reset(NULL);
|
| }
|
| - ScreenlockBridge::Get()->SetLockHandler(NULL);
|
| - ScreenlockBridge::Get()->SetFocusedUser("");
|
| + SigninScreenBridge::Get()->SetLockHandler(NULL);
|
| + SigninScreenBridge::Get()->SetFocusedUser("");
|
| }
|
|
|
| void SigninScreenHandler::DeclareLocalizedValues(
|
| @@ -941,7 +941,7 @@ void SigninScreenHandler::ShowBannerMessage(const base::string16& message) {
|
|
|
| void SigninScreenHandler::ShowUserPodCustomIcon(
|
| const std::string& username,
|
| - const ScreenlockBridge::UserPodCustomIconOptions& icon_options) {
|
| + const SigninScreenBridge::UserPodCustomIconOptions& icon_options) {
|
| scoped_ptr<base::DictionaryValue> icon = icon_options.ToDictionaryValue();
|
| if (!icon || icon->empty())
|
| return;
|
| @@ -959,10 +959,10 @@ void SigninScreenHandler::EnableInput() {
|
|
|
| void SigninScreenHandler::SetAuthType(
|
| const std::string& username,
|
| - ScreenlockBridge::LockHandler::AuthType auth_type,
|
| + SigninScreenBridge::LockHandler::AuthType auth_type,
|
| const base::string16& initial_value) {
|
| if (delegate_->GetAuthType(username) ==
|
| - ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
|
| + SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
|
| return;
|
|
|
| delegate_->SetAuthType(username, auth_type);
|
| @@ -973,7 +973,7 @@ void SigninScreenHandler::SetAuthType(
|
| base::StringValue(initial_value));
|
| }
|
|
|
| -ScreenlockBridge::LockHandler::AuthType SigninScreenHandler::GetAuthType(
|
| +SigninScreenBridge::LockHandler::AuthType SigninScreenHandler::GetAuthType(
|
| const std::string& username) const {
|
| return delegate_->GetAuthType(username);
|
| }
|
| @@ -1245,7 +1245,7 @@ void SigninScreenHandler::HandleAccountPickerReady() {
|
| if (ScreenLocker::default_screen_locker()) {
|
| ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
|
| }
|
| - ScreenlockBridge::Get()->SetLockHandler(this);
|
| + SigninScreenBridge::Get()->SetLockHandler(this);
|
|
|
| if (delegate_)
|
| delegate_->OnSigninScreenReady();
|
| @@ -1355,12 +1355,12 @@ void SigninScreenHandler::HandleUpdateOfflineLogin(bool offline_login_active) {
|
| void SigninScreenHandler::HandleFocusPod(const std::string& user_id) {
|
| SetUserInputMethod(user_id);
|
| WallpaperManager::Get()->SetUserWallpaperDelayed(user_id);
|
| - ScreenlockBridge::Get()->SetFocusedUser(user_id);
|
| + SigninScreenBridge::Get()->SetFocusedUser(user_id);
|
| }
|
|
|
| void SigninScreenHandler::HandleHardlockPod(const std::string& user_id) {
|
| SetAuthType(user_id,
|
| - ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD,
|
| + SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD,
|
| base::string16());
|
| HideUserPodCustomIcon(user_id);
|
| }
|
|
|