Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
index 670e62413529b8c57e1df399e3230477d41108f9..451807001066ba1ec3b233ffb5263c0e1070ad45 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h |
@@ -21,7 +21,7 @@ |
#include "chrome/browser/chromeos/login/signin_specifics.h" |
#include "chrome/browser/chromeos/login/ui/login_display.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
-#include "chrome/browser/signin/screenlock_bridge.h" |
+#include "chrome/browser/signin/signin_screen_bridge.h" |
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" |
#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
@@ -194,10 +194,10 @@ class SigninScreenHandlerDelegate { |
// Set authentication type (for easier unlocking). |
virtual void SetAuthType( |
const std::string& username, |
- ScreenlockBridge::LockHandler::AuthType auth_type) = 0; |
+ SigninScreenBridge::LockHandler::AuthType auth_type) = 0; |
// Get authentication type (for easier unlocking). |
- virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( |
+ virtual SigninScreenBridge::LockHandler::AuthType GetAuthType( |
const std::string& username) const = 0; |
protected: |
@@ -210,7 +210,7 @@ class SigninScreenHandler |
: public BaseScreenHandler, |
public LoginDisplayWebUIHandler, |
public content::NotificationObserver, |
- public ScreenlockBridge::LockHandler, |
+ public SigninScreenBridge::LockHandler, |
public NetworkStateInformer::NetworkStateInformerObserver, |
public input_method::ImeKeyboard::Observer, |
public TouchViewControllerDelegate::Observer { |
@@ -313,17 +313,17 @@ class SigninScreenHandler |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
- // ScreenlockBridge::LockHandler implementation: |
+ // SigninScreenBridge::LockHandler implementation: |
virtual void ShowBannerMessage(const base::string16& message) OVERRIDE; |
virtual void ShowUserPodCustomIcon( |
const std::string& username, |
- const ScreenlockBridge::UserPodCustomIconOptions& icon) OVERRIDE; |
+ const SigninScreenBridge::UserPodCustomIconOptions& icon) OVERRIDE; |
virtual void HideUserPodCustomIcon(const std::string& username) OVERRIDE; |
virtual void EnableInput() OVERRIDE; |
virtual void SetAuthType(const std::string& username, |
- ScreenlockBridge::LockHandler::AuthType auth_type, |
+ SigninScreenBridge::LockHandler::AuthType auth_type, |
const base::string16& initial_value) OVERRIDE; |
- virtual ScreenlockBridge::LockHandler::AuthType GetAuthType( |
+ virtual SigninScreenBridge::LockHandler::AuthType GetAuthType( |
const std::string& username) const OVERRIDE; |
virtual void Unlock(const std::string& user_email) OVERRIDE; |
virtual void AttemptUserClickLogin(const std::string& user_email, |