Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker.cc

Issue 2876673002: mojo api for view based lockscreen (Closed)
Patch Set: hash password before sending it through mojo. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/lock/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index e0b05e96e74706aa3dc4f823345f830c464ae105..ca2784bb35c89897865b7b03b07925e29669e0cd 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -42,6 +42,7 @@
#include "chrome/browser/signin/easy_unlock_service.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/lock_screen_client_chromeos.h"
#include "chrome/browser/ui/ash/session_controller_client.h"
#include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h"
#include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h"
@@ -166,18 +167,21 @@ class ScreenLockObserver : public SessionManagerClient::StubDelegate,
};
// Stubbed delegate that will eventually be replaced by mojo calls.
-class StubDelegate : public ScreenLocker::Delegate {
+class MojoDelegate : public ScreenLocker::Delegate {
public:
- StubDelegate() = default;
- ~StubDelegate() override = default;
+ MojoDelegate() = default;
+ ~MojoDelegate() override = default;
// ScreenLocker::Delegate:
void SetPasswordInputEnabled(bool enabled) override { NOTIMPLEMENTED(); }
void ShowErrorMessage(int error_msg_id,
HelpAppLauncher::HelpTopic help_topic_id) override {
- NOTIMPLEMENTED();
+ // TODO(xiaoyinh): Complete the implementation here.
+ LockScreenClientChromeOS::Get()->ShowErrorMessage();
+ }
+ void ClearErrors() override {
+ LockScreenClientChromeOS::Get()->ClearErrors();
}
- void ClearErrors() override { NOTIMPLEMENTED(); }
void AnimateAuthenticationSuccess() override { NOTIMPLEMENTED(); }
void OnLockWebUIReady() override { NOTIMPLEMENTED(); }
void OnLockBackgroundDisplayed() override { NOTIMPLEMENTED(); }
@@ -190,7 +194,7 @@ class StubDelegate : public ScreenLocker::Delegate {
content::WebContents* GetWebContents() override { return nullptr; }
private:
- DISALLOW_COPY_AND_ASSIGN(StubDelegate);
+ DISALLOW_COPY_AND_ASSIGN(MojoDelegate);
};
ScreenLockObserver* g_screen_lock_observer = nullptr;
@@ -238,7 +242,7 @@ void ScreenLocker::Init() {
if (IsUsingMdLogin()) {
// Create delegate that will eventually call into the views-based lock
jdufault 2017/05/13 00:57:40 nit: Can you update the comment? // Create delega
xiaoyinh(OOO Sep 11-29) 2017/05/15 20:13:05 Done.
// screen via mojo.
- delegate_ = new StubDelegate();
+ delegate_ = new MojoDelegate();
owns_delegate_ = true;
// Create and display lock screen.

Powered by Google App Engine
This is Rietveld 408576698