Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc |
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc |
index 94fa1cb9f19a025115137ecff64dc14544ae4ef5..50014f6edf89eb217d2c83bc412202409158cac5 100644 |
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc |
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc |
@@ -18,23 +18,23 @@ namespace extensions { |
namespace { |
screenlock::AuthType FromLockHandlerAuthType( |
- ScreenlockBridge::LockHandler::AuthType auth_type) { |
+ SigninScreenBridge::LockHandler::AuthType auth_type) { |
switch (auth_type) { |
- case ScreenlockBridge::LockHandler::OFFLINE_PASSWORD: |
+ case SigninScreenBridge::LockHandler::OFFLINE_PASSWORD: |
return screenlock::AUTH_TYPE_OFFLINEPASSWORD; |
- case ScreenlockBridge::LockHandler::NUMERIC_PIN: |
+ case SigninScreenBridge::LockHandler::NUMERIC_PIN: |
return screenlock::AUTH_TYPE_NUMERICPIN; |
- case ScreenlockBridge::LockHandler::USER_CLICK: |
+ case SigninScreenBridge::LockHandler::USER_CLICK: |
return screenlock::AUTH_TYPE_USERCLICK; |
- case ScreenlockBridge::LockHandler::ONLINE_SIGN_IN: |
+ case SigninScreenBridge::LockHandler::ONLINE_SIGN_IN: |
// Apps should treat forced online sign in same as system password. |
return screenlock::AUTH_TYPE_OFFLINEPASSWORD; |
- case ScreenlockBridge::LockHandler::EXPAND_THEN_USER_CLICK: |
+ case SigninScreenBridge::LockHandler::EXPAND_THEN_USER_CLICK: |
// This type is used for public sessions, which do not support screen |
// locking. |
NOTREACHED(); |
return screenlock::AUTH_TYPE_NONE; |
- case ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD: |
+ case SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD: |
return screenlock::AUTH_TYPE_OFFLINEPASSWORD; |
} |
NOTREACHED(); |
@@ -48,7 +48,7 @@ ScreenlockPrivateGetLockedFunction::ScreenlockPrivateGetLockedFunction() {} |
ScreenlockPrivateGetLockedFunction::~ScreenlockPrivateGetLockedFunction() {} |
bool ScreenlockPrivateGetLockedFunction::RunAsync() { |
- SetResult(new base::FundamentalValue(ScreenlockBridge::Get()->IsLocked())); |
+ SetResult(new base::FundamentalValue(SigninScreenBridge::Get()->IsLocked())); |
SendResponse(error_.empty()); |
return true; |
} |
@@ -62,9 +62,9 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() { |
screenlock::SetLocked::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
if (params->locked) |
- ScreenlockBridge::Get()->Lock(GetProfile()); |
+ SigninScreenBridge::Get()->Lock(GetProfile()); |
else |
- ScreenlockBridge::Get()->Unlock(GetProfile()); |
+ SigninScreenBridge::Get()->Unlock(GetProfile()); |
SendResponse(error_.empty()); |
return true; |
} |
@@ -88,7 +88,7 @@ bool ScreenlockPrivateAcceptAuthAttemptFunction::RunSync() { |
ScreenlockPrivateEventRouter::ScreenlockPrivateEventRouter( |
content::BrowserContext* context) |
: browser_context_(context) { |
- ScreenlockBridge::Get()->AddObserver(this); |
+ SigninScreenBridge::Get()->AddObserver(this); |
} |
ScreenlockPrivateEventRouter::~ScreenlockPrivateEventRouter() {} |
@@ -128,11 +128,11 @@ ScreenlockPrivateEventRouter::GetFactoryInstance() { |
} |
void ScreenlockPrivateEventRouter::Shutdown() { |
- ScreenlockBridge::Get()->RemoveObserver(this); |
+ SigninScreenBridge::Get()->RemoveObserver(this); |
} |
bool ScreenlockPrivateEventRouter::OnAuthAttempted( |
- ScreenlockBridge::LockHandler::AuthType auth_type, |
+ SigninScreenBridge::LockHandler::AuthType auth_type, |
const std::string& value) { |
extensions::EventRouter* router = |
extensions::EventRouter::Get(browser_context_); |