| Index: chrome/browser/signin/signin_screen_bridge.h
|
| diff --git a/chrome/browser/signin/screenlock_bridge.h b/chrome/browser/signin/signin_screen_bridge.h
|
| similarity index 91%
|
| rename from chrome/browser/signin/screenlock_bridge.h
|
| rename to chrome/browser/signin/signin_screen_bridge.h
|
| index ee6cb8271f09f24a805bf793b8f50418468473a1..fd3dfad3358cf22d06c70747ee10dffead4c6e2b 100644
|
| --- a/chrome/browser/signin/screenlock_bridge.h
|
| +++ b/chrome/browser/signin/signin_screen_bridge.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_
|
| -#define CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_
|
| +#ifndef CHROME_BROWSER_SIGNIN_SIGNIN_SCREEN_BRIDGE_H_
|
| +#define CHROME_BROWSER_SIGNIN_SIGNIN_SCREEN_BRIDGE_H_
|
|
|
| #include <string>
|
|
|
| @@ -18,12 +18,12 @@
|
|
|
| class Profile;
|
|
|
| -// ScreenlockBridge brings together the screenLockPrivate API and underlying
|
| +// SigninScreenBridge brings together the screenLockPrivate API and underlying
|
| // support. On ChromeOS, it delegates calls to the ScreenLocker. On other
|
| // platforms, it delegates calls to UserManagerUI (and friends).
|
| // TODO(tbarzic): Rename ScreelockBridge to SignInScreenBridge, as this is not
|
| // used solely for the lock screen anymore.
|
| -class ScreenlockBridge {
|
| +class SigninScreenBridge {
|
| public:
|
| class Observer {
|
| public:
|
| @@ -144,7 +144,7 @@ class ScreenlockBridge {
|
| virtual ~LockHandler() {}
|
| };
|
|
|
| - static ScreenlockBridge* Get();
|
| + static SigninScreenBridge* Get();
|
| static std::string GetAuthenticatedUserEmail(Profile* profile);
|
|
|
| void SetLockHandler(LockHandler* lock_handler);
|
| @@ -162,18 +162,18 @@ class ScreenlockBridge {
|
| std::string focused_user_id() const { return focused_user_id_; }
|
|
|
| private:
|
| - friend struct base::DefaultLazyInstanceTraits<ScreenlockBridge>;
|
| - friend struct base::DefaultDeleter<ScreenlockBridge>;
|
| + friend struct base::DefaultLazyInstanceTraits<SigninScreenBridge>;
|
| + friend struct base::DefaultDeleter<SigninScreenBridge>;
|
|
|
| - ScreenlockBridge();
|
| - ~ScreenlockBridge();
|
| + SigninScreenBridge();
|
| + ~SigninScreenBridge();
|
|
|
| LockHandler* lock_handler_; // Not owned
|
| // The last focused user's id.
|
| std::string focused_user_id_;
|
| ObserverList<Observer, true> observers_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ScreenlockBridge);
|
| + DISALLOW_COPY_AND_ASSIGN(SigninScreenBridge);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_SIGNIN_SCREENLOCK_BRIDGE_H_
|
| +#endif // CHROME_BROWSER_SIGNIN_SIGNIN_SCREEN_BRIDGE_H_
|
|
|