Move screenlock_bridge to components/proximity_auth

chrome/browser/chromeos/login/screens/user_selection_screen.cc

Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index 2156e875ba8628f148baace53f9a2db02cb3f8a4..3c3c5ff7469b8fdb30f9dc3e21c06e63478840f9 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -18,9 +18,11 @@
 #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"
@@ -118,14 +120,14 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
 }
 
 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(
@@ -445,15 +447,15 @@ void UserSelectionScreen::SetAuthType(const std::string& user_id,
   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;
 
@@ -469,7 +471,8 @@ void UserSelectionScreen::ShowBannerMessage(const base::string16& 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;