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/signin/easy_unlock_service.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/signin/easy_unlock_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
+#include "components/proximity_auth/screenlock_bridge.h"
+#include "components/signin/core/browser/signin_manager_base.h"

[Ilya Sherman, 2015/04/24 21:22:01]

nit: Not needed?

[msarda, 2015/04/27 11:29:24]

Done.

 #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 77 matching lines @@
 
 UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
     : handler_(nullptr),
       login_display_delegate_(nullptr),
       view_(nullptr),
       display_type_(display_type),
       weak_factory_(this) {
 }
 
 UserSelectionScreen::~UserSelectionScreen() {
-  ScreenlockBridge::Get()->SetLockHandler(nullptr);
+  GetScreenlockBridgeInstance()->SetLockHandler(nullptr);
   ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
 
 void UserSelectionScreen::InitEasyUnlock() {
-  ScreenlockBridge::Get()->SetLockHandler(this);
+  GetScreenlockBridgeInstance()->SetLockHandler(this);
 }
 
 void UserSelectionScreen::SetLoginDisplayDelegate(
     LoginDisplay::Delegate* login_display_delegate) {
   login_display_delegate_ = login_display_delegate;
 }
 
 // static
 void UserSelectionScreen::FillUserDictionary(
     user_manager::User* user,
@@ skipping 299 matching lines @@
                                       AuthType auth_type,
                                       const base::string16& initial_value) {
   if (GetAuthType(user_id) == FORCE_OFFLINE_PASSWORD)
     return;
   DCHECK(GetAuthType(user_id) != FORCE_OFFLINE_PASSWORD ||
          auth_type == FORCE_OFFLINE_PASSWORD);
   user_auth_type_map_[user_id] = auth_type;
   view_->SetAuthType(user_id, auth_type, initial_value);
 }
 
-ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
-    const std::string& username) const {
+proximity_auth::ScreenlockBridge::LockHandler::AuthType
+UserSelectionScreen::GetAuthType(const std::string& username) const {
   if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
     return OFFLINE_PASSWORD;
   return user_auth_type_map_.find(username)->second;
 }
 
-ScreenlockBridge::LockHandler::ScreenType UserSelectionScreen::GetScreenType()
-    const {
+proximity_auth::ScreenlockBridge::LockHandler::ScreenType
+UserSelectionScreen::GetScreenType() const {
   if (display_type_ == OobeUI::kLockDisplay)
     return LOCK_SCREEN;
 
   if (display_type_ == OobeUI::kLoginDisplay)
     return SIGNIN_SCREEN;
 
   return OTHER_SCREEN;
 }
 
 void UserSelectionScreen::ShowBannerMessage(const base::string16& message) {
   view_->ShowBannerMessage(message);
 }
 
 void UserSelectionScreen::ShowUserPodCustomIcon(
     const std::string& user_id,
-    const ScreenlockBridge::UserPodCustomIconOptions& icon_options) {
+    const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&
+        icon_options) {
   scoped_ptr<base::DictionaryValue> icon = icon_options.ToDictionaryValue();
   if (!icon || icon->empty())
     return;
   view_->ShowUserPodCustomIcon(user_id, *icon);
 }
 
 void UserSelectionScreen::HideUserPodCustomIcon(const std::string& user_id) {
   view_->HideUserPodCustomIcon(user_id);
 }
 
@@ skipping 66 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