Adding mojo calls for easy unlock service

chrome/browser/chromeos/login/lock/screen_locker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/login/ui/lock_screen.h"
@@ skipping 11 matching lines @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
+#include "chrome/browser/chromeos/login/lock/view_screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
@@ skipping 116 matching lines @@
     ScreenLocker::HandleLockScreenRequest();
   }
 
  private:
   bool session_started_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver);
 };
 
-// Mojo delegate that calls into the views-based lock screen via mojo.
-class MojoDelegate : public ScreenLocker::Delegate {
- public:
-  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 {
-    // TODO(xiaoyinh): Complete the implementation here.
-    LockScreenClient::Get()->ShowErrorMessage(0 /* login_attempts */,
-                                              std::string(), std::string(),
-                                              static_cast<int>(help_topic_id));
-  }
-  void ClearErrors() override { LockScreenClient::Get()->ClearErrors(); }
-  void AnimateAuthenticationSuccess() override { NOTIMPLEMENTED(); }
-  void OnLockWebUIReady() override { NOTIMPLEMENTED(); }
-  void OnLockBackgroundDisplayed() override { NOTIMPLEMENTED(); }
-  void OnHeaderBarVisible() override { NOTIMPLEMENTED(); }
-  void OnAshLockAnimationFinished() override { NOTIMPLEMENTED(); }
-  void SetFingerprintState(const AccountId& account_id,
-                           ScreenLocker::FingerprintState state) override {
-    NOTIMPLEMENTED();
-  }
-  content::WebContents* GetWebContents() override { return nullptr; }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MojoDelegate);
-};
-
 ScreenLockObserver* g_screen_lock_observer = nullptr;
 
 }  // namespace
 
 // static
 ScreenLocker* ScreenLocker::screen_locker_ = nullptr;
 
 //////////////////////////////////////////////////////////////////////////////
 // ScreenLocker::Delegate, public:
 
@@ skipping 24 matching lines @@
 void ScreenLocker::Init() {
   input_method::InputMethodManager* imm =
       input_method::InputMethodManager::Get();
   saved_ime_state_ = imm->GetActiveIMEState();
   imm->SetState(saved_ime_state_->Clone());
 
   authenticator_ = UserSessionManager::GetInstance()->CreateAuthenticator(this);
   extended_authenticator_ = ExtendedAuthenticator::Create(this);
   if (IsUsingMdLogin()) {
     // Create delegate that calls into the views-based lock screen via mojo.
-    delegate_ = new MojoDelegate();
-    owns_delegate_ = true;
+    view_screen_locker_.reset(new ViewScreenLocker(this));

[xiyuan, 2017/05/31 17:51:18]

nit: view_screen_locker_ = base::MakeUnique<ViewScreenLocker>(this);

[xiaoyinh(OOO Sep 11-29), 2017/06/02 23:42:28]

Done.

+    delegate_ = view_screen_locker_.get();
+    view_screen_locker_->Init();
 
     // Create and display lock screen.
     // TODO(jdufault): Calling ash::ShowLockScreenInWidget should be a mojo
     // call. We should only set the session state to locked after the mojo call
     // has completed.
-    if (ash::ShowLockScreen()) {
-      session_manager::SessionManager::Get()->SetSessionState(
-          session_manager::SessionState::LOCKED);
-    }
+    if (ash::ShowLockScreen())
+      view_screen_locker_->OnLockScreenReady();
   } else {
     web_ui_.reset(new WebUIScreenLocker(this));
     delegate_ = web_ui_.get();
-    owns_delegate_ = false;
     web_ui_->LockScreen();
 
     // Ownership of |icon_image_source| is passed.
     screenlock_icon_provider_ = base::MakeUnique<ScreenlockIconProvider>();
     ScreenlockIconSource* screenlock_icon_source =
         new ScreenlockIconSource(screenlock_icon_provider_->AsWeakPtr());
     content::URLDataSource::Add(web_ui_->web_contents()->GetBrowserContext(),
                                 screenlock_icon_source);
   }
 
@@ skipping 344 matching lines @@
   VLOG(1) << "Calling session manager's HandleLockScreenDismissed D-Bus method";
   DBusThreadManager::Get()->GetSessionManagerClient()->
       NotifyLockScreenDismissed();
 
   session_manager::SessionManager::Get()->SetSessionState(
       session_manager::SessionState::ACTIVE);
 
   if (saved_ime_state_.get()) {
     input_method::InputMethodManager::Get()->SetState(saved_ime_state_);
   }
-
-  if (owns_delegate_) {
-    owns_delegate_ = false;
-    delete delegate_;
-    delegate_ = nullptr;
-  }
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
   authenticator_ = authenticator;
 }
 
 void ScreenLocker::ScreenLockReady() {
   locked_ = true;
   base::TimeDelta delta = base::Time::Now() - start_time_;
   VLOG(1) << "ScreenLocker " << this << " is ready after "
@@ skipping 80 matching lines @@
     }
   }
 
   if (auth_status_consumer_) {
     AuthFailure failure(AuthFailure::UNLOCK_FAILED);
     auth_status_consumer_->OnAuthFailure(failure);
   }
 }
 
 }  // namespace chromeos