Move screenlock_bridge to components/proximity_auth

chrome/browser/chromeos/login/screens/user_selection_screen.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/screens/user_selection_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
+#include "components/signin/content/screenlock_bridge.h"
+#include "components/signin/core/browser/signin_manager_base.h"
 #include "components/user_manager/user_id.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
 namespace {
 
 // User dictionary keys.
@@ skipping 447 matching lines @@
 }
 
 void UserSelectionScreen::EnableInput() {
   // If Easy Unlock fails to unlock the screen, re-enable the password input.
   // This is only necessary on the lock screen, because the error handling for
   // the sign-in screen uses a different code path.
   if (ScreenLocker::default_screen_locker())
     ScreenLocker::default_screen_locker()->EnableInput();
 }
 
+void UserSelectionScreen::Lock(content::BrowserContext* browser_context) {
+  profiles::LockProfile(Profile::FromBrowserContext(browser_context));
+}
+
+void UserSelectionScreen::Unlock(content::BrowserContext* browser_context) {
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(profile);

[Ilya Sherman, 2015/04/21 23:02:39]

This is not exactly equivalent to the previous implementation.  Could you please
preserve the previous implementation?

[msarda, 2015/04/22 16:42:42]

Done.

+  Unlock(signin_manager->GetAuthenticatedUsername());
+}

[Ilya Sherman, 2015/04/21 23:02:39]

Rather than duplicating the implementations of these methods here and in
user_manager_screen_handler.cc, I'd prefer to share the implementation.  One
reasonable approach is to use a client interface, as we do in other components.

[msarda, 2015/04/22 16:42:42]

I considered using a client interface, however IMHO the API would be extremely
weird as the ScreenlockBridge is a singleton and it only created and accessed
via ScreenlockBridge::Get. I do not see how / when I could set the client of the
SceeenLockBridge.

I think the natural place for this is the LockHandler (this is actually the
client interface for the ScreenlockBridge).

[Ilya Sherman, 2015/04/23 07:09:48]

The component setup code could call a method to set the client for the
ScreenlockBridge very early on, before any other calls to Get() are made.  The
ScreenlockBridge could guarantee this by not null-checking the client, which
would mean that if the setup code did not execute early enough, we'd see a null
pointer dereference, which is easy to track down.
Actually, the LockHandler is only set when the screen is locked.  So, it really
doesn't make very much sense for the LockHandler to have a Lock() method -- the
ScreenlockBridge won't have a lock handler set if we're calling Lock().



All that said, if you really don't like the idea of using a client interface,
and can demonstrate that I'm wrong about the Lock() method, then please at least
create a single ChromeLockHandler class that these two classes can both derive
from, rather than duplicating the code.

+
 void UserSelectionScreen::Unlock(const std::string& user_email) {
   DCHECK_EQ(GetScreenType(), LOCK_SCREEN);
   ScreenLocker::Hide();
 }
 
 void UserSelectionScreen::AttemptEasySignin(const std::string& user_id,
                                             const std::string& secret,
                                             const std::string& key_label) {
   DCHECK_EQ(GetScreenType(), SIGNIN_SCREEN);
 
@@ skipping 48 matching lines @@
   // The user profile should exist if and only if this is the lock screen.
   DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos