Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
index 73bbd66bd1544a1e541d2901b14cef5159ede8cd..4df34369e0698f19bd4be473cbc2894767d23271 100644 |
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h |
@@ -12,7 +12,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/profiles/profile_metrics.h" |
-#include "chrome/browser/signin/screenlock_bridge.h" |
+#include "chrome/browser/signin/signin_screen_bridge.h" |
#include "chrome/browser/ui/host_desktop.h" |
#include "content/public/browser/web_ui_message_handler.h" |
#include "google_apis/gaia/gaia_auth_consumer.h" |
@@ -26,7 +26,7 @@ class ListValue; |
} |
class UserManagerScreenHandler : public content::WebUIMessageHandler, |
- public ScreenlockBridge::LockHandler, |
+ public SigninScreenBridge::LockHandler, |
public GaiaAuthConsumer { |
public: |
UserManagerScreenHandler(); |
@@ -37,17 +37,18 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler, |
void GetLocalizedValues(base::DictionaryValue* localized_strings); |
- // ScreenlockBridge::LockHandler implementation. |
+ // SigninScreenBridge::LockHandler implementation. |
virtual void ShowBannerMessage(const base::string16& message) OVERRIDE; |
virtual void ShowUserPodCustomIcon( |
const std::string& user_email, |
- const ScreenlockBridge::UserPodCustomIconOptions& icon_options) OVERRIDE; |
+ const SigninScreenBridge::UserPodCustomIconOptions& icon_options) |
+ OVERRIDE; |
virtual void HideUserPodCustomIcon(const std::string& user_email) OVERRIDE; |
virtual void EnableInput() OVERRIDE; |
virtual void SetAuthType(const std::string& user_email, |
- ScreenlockBridge::LockHandler::AuthType auth_type, |
+ SigninScreenBridge::LockHandler::AuthType auth_type, |
const base::string16& auth_value) OVERRIDE; |
- virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( |
+ virtual SigninScreenBridge::LockHandler::AuthType GetAuthType( |
const std::string& user_email) const OVERRIDE; |
virtual void Unlock(const std::string& user_email) OVERRIDE; |
virtual void AttemptUserClickLogin(const std::string& user_email, |
@@ -96,7 +97,7 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler, |
// Login password, held during on-line auth for saving later if correct. |
std::string password_attempt_; |
- typedef std::map<std::string, ScreenlockBridge::LockHandler::AuthType> |
+ typedef std::map<std::string, SigninScreenBridge::LockHandler::AuthType> |
UserAuthTypeMap; |
UserAuthTypeMap user_auth_type_map_; |