| 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 78d1c4907185a2790a18718020d7dd57fb664fdb..9bffd053305500e78856dd2a40f08c835741c2a1 100644
|
| --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/signin/easy_unlock_service.h"
|
| +#include "chrome/browser/signin/easy_unlock_util.h"
|
| #include "chrome/common/extensions/api/screenlock_private.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "extensions/browser/app_window/app_window_registry.h"
|
| @@ -50,7 +51,8 @@ ScreenlockPrivateGetLockedFunction::ScreenlockPrivateGetLockedFunction() {}
|
| ScreenlockPrivateGetLockedFunction::~ScreenlockPrivateGetLockedFunction() {}
|
|
|
| bool ScreenlockPrivateGetLockedFunction::RunAsync() {
|
| - SetResult(new base::FundamentalValue(ScreenlockBridge::Get()->IsLocked()));
|
| + SetResult(
|
| + new base::FundamentalValue(GetScreenlockBridgeInstance()->IsLocked()));
|
| SendResponse(error_.empty());
|
| return true;
|
| }
|
| @@ -75,9 +77,9 @@ bool ScreenlockPrivateSetLockedFunction::RunAsync() {
|
| if (service)
|
| service->SetTrialRun();
|
| }
|
| - ScreenlockBridge::Get()->Lock(GetProfile());
|
| + GetScreenlockBridgeInstance()->Lock(GetProfile());
|
| } else {
|
| - ScreenlockBridge::Get()->Unlock(GetProfile());
|
| + GetScreenlockBridgeInstance()->Unlock(GetProfile());
|
| }
|
| SendResponse(error_.empty());
|
| return true;
|
| @@ -104,7 +106,7 @@ bool ScreenlockPrivateAcceptAuthAttemptFunction::RunSync() {
|
| ScreenlockPrivateEventRouter::ScreenlockPrivateEventRouter(
|
| content::BrowserContext* context)
|
| : browser_context_(context) {
|
| - ScreenlockBridge::Get()->AddObserver(this);
|
| + GetScreenlockBridgeInstance()->AddObserver(this);
|
| }
|
|
|
| ScreenlockPrivateEventRouter::~ScreenlockPrivateEventRouter() {}
|
| @@ -146,7 +148,7 @@ ScreenlockPrivateEventRouter::GetFactoryInstance() {
|
| }
|
|
|
| void ScreenlockPrivateEventRouter::Shutdown() {
|
| - ScreenlockBridge::Get()->RemoveObserver(this);
|
| + GetScreenlockBridgeInstance()->RemoveObserver(this);
|
| }
|
|
|
| bool ScreenlockPrivateEventRouter::OnAuthAttempted(
|
|
|