Move screenlock_bridge to components/proximity_auth

components/signin/content/screenlock_bridge.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/signin/screenlock_bridge.h"
+#include "components/signin/content/screenlock_bridge.h"

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

I think the proximity_auth component is more appropriate.  In terms of whether
to nest in a content directory or not, it depends: Do we foresee ever building
the proximity auth component on iOS?  If so, then a layered component makes
sense -- and you should take my comments referring to a "client" interface as
really referring to a "driver" interface.  If not, then there's probably no need
for the extra layer of nesting.

 
 #include "base/logging.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/profiles/profile_window.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "components/signin/core/browser/signin_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
 namespace {
 
 base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_bridge_instance =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 35 matching lines @@
 ScreenlockBridge* ScreenlockBridge::Get() {
   return g_screenlock_bridge_bridge_instance.Pointer();
 }
 
 ScreenlockBridge::UserPodCustomIconOptions::UserPodCustomIconOptions()
     : autoshow_tooltip_(false),
       hardlock_on_click_(false),
       is_trial_run_(false) {
 }
 
-ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {}
+ScreenlockBridge::UserPodCustomIconOptions::~UserPodCustomIconOptions() {
+}
 
 scoped_ptr<base::DictionaryValue>
 ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   std::string icon_id = GetIdForIcon(icon_);
   result->SetString("id", icon_id);
 
   if (!tooltip_.empty()) {
     base::DictionaryValue* tooltip_options = new base::DictionaryValue();
     tooltip_options->SetString("text", tooltip_);
@@ skipping 31 matching lines @@
 }
 
 void ScreenlockBridge::UserPodCustomIconOptions::SetHardlockOnClick() {
   hardlock_on_click_ = true;
 }
 
 void ScreenlockBridge::UserPodCustomIconOptions::SetTrialRun() {
   is_trial_run_ = true;
 }
 
-// static
-std::string ScreenlockBridge::GetAuthenticatedUserEmail(
-    const Profile* profile) {
-  // |profile| has to be a signed-in profile with SigninManager already
-  // created. Otherwise, just crash to collect stack.
-  const SigninManagerBase* signin_manager =
-      SigninManagerFactory::GetForProfileIfExists(profile);
-  return signin_manager->GetAuthenticatedUsername();
-}
-
 ScreenlockBridge::ScreenlockBridge() : lock_handler_(NULL) {
 }
 
 ScreenlockBridge::~ScreenlockBridge() {
 }
 
 void ScreenlockBridge::SetLockHandler(LockHandler* lock_handler) {
   DCHECK(lock_handler_ == NULL || lock_handler == NULL);
 
   // Don't notify observers if there is no change -- i.e. if the screen was
@@ skipping 20 matching lines @@
   if (user_id == focused_user_id_)
     return;
   focused_user_id_ = user_id;
   FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id));
 }
 
 bool ScreenlockBridge::IsLocked() const {
   return lock_handler_ != NULL;
 }
 
-void ScreenlockBridge::Lock(Profile* profile) {
+void ScreenlockBridge::Lock(content::BrowserContext* browser_context) {
 #if defined(OS_CHROMEOS)
   chromeos::SessionManagerClient* session_manager =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager->RequestLockScreen();
 #else
-  profiles::LockProfile(profile);
+  if (lock_handler_)
+    lock_handler_->Lock(browser_context);
 #endif
 }
 
-void ScreenlockBridge::Unlock(Profile* profile) {
+void ScreenlockBridge::Unlock(content::BrowserContext* browser_context) {
   if (lock_handler_)
-    lock_handler_->Unlock(GetAuthenticatedUserEmail(profile));
+    lock_handler_->Unlock(browser_context);
 }
 
 void ScreenlockBridge::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ScreenlockBridge::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }