Index: chrome/browser/signin/easy_unlock_screenlock_state_handler.h |
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.h b/chrome/browser/signin/easy_unlock_screenlock_state_handler.h |
index 359b09b5a253dfe46e3debaca4d248d0294b8b1c..a5e9dbbc4ad8898e44f014fe5f303bb38dcad7cc 100644 |
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.h |
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.h |
@@ -9,13 +9,13 @@ |
#include "base/strings/string16.h" |
#include "base/timer/timer.h" |
-#include "chrome/browser/signin/screenlock_bridge.h" |
+#include "chrome/browser/signin/signin_screen_bridge.h" |
class PrefService; |
// Profile specific class responsible for updating screenlock UI for the user |
// associated with the profile when their Easy Unlock state changes. |
-class EasyUnlockScreenlockStateHandler : public ScreenlockBridge::Observer { |
+class EasyUnlockScreenlockStateHandler : public SigninScreenBridge::Observer { |
public: |
// Available Easy Unlock states. |
enum State { |
@@ -48,11 +48,11 @@ class EasyUnlockScreenlockStateHandler : public ScreenlockBridge::Observer { |
// |user_email|: The email for the user associated with the profile to which |
// this class is attached. |
// |pref_service|: The profile preferences. |
- // |screenlock_bridge|: The screenlock bridge used to update the screen lock |
- // state. |
+ // |signin_screen_bridge|: The screenlock bridge used to update the screen |
+ // lock state. |
EasyUnlockScreenlockStateHandler(const std::string& user_email, |
PrefService* pref_service, |
- ScreenlockBridge* screenlock_bridge); |
+ SigninScreenBridge* signin_screen_bridge); |
virtual ~EasyUnlockScreenlockStateHandler(); |
// Changes internal state to |new_state| and updates the user's screenlock |
@@ -60,7 +60,7 @@ class EasyUnlockScreenlockStateHandler : public ScreenlockBridge::Observer { |
void ChangeState(State new_state); |
private: |
- // ScreenlockBridge::Observer: |
+ // SigninScreenBridge::Observer: |
virtual void OnScreenDidLock() OVERRIDE; |
virtual void OnScreenDidUnlock() OVERRIDE; |
virtual void OnFocusedUserChanged(const std::string& user_id) OVERRIDE; |
@@ -69,7 +69,7 @@ class EasyUnlockScreenlockStateHandler : public ScreenlockBridge::Observer { |
// |trial_run|: Whether the trial Easy Unlock run is in progress. |
void UpdateTooltipOptions( |
bool trial_run, |
- ScreenlockBridge::UserPodCustomIconOptions* icon_options); |
+ SigninScreenBridge::UserPodCustomIconOptions* icon_options); |
// Whether this is the first, trial Easy Unlock run. If this is the case, a |
// tutorial message should be shown and hard-locking be disabled in |
@@ -90,7 +90,7 @@ class EasyUnlockScreenlockStateHandler : public ScreenlockBridge::Observer { |
State state_; |
std::string user_email_; |
PrefService* pref_service_; |
- ScreenlockBridge* screenlock_bridge_; |
+ SigninScreenBridge* signin_screen_bridge_; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockScreenlockStateHandler); |
}; |