Hook up new API for easy unlock to update lock screen

chrome/browser/signin/easy_unlock_service.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/easy_unlock_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "chrome/browser/signin/easy_unlock_service_factory.h"
+#include "chrome/browser/signin/screenlock_bridge.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/one_shot_event.h"
 #include "grit/browser_resources.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/user_manager.h"
@@ skipping 11 matching lines @@
 }
 
 }  // namespace
 
 // static
 EasyUnlockService* EasyUnlockService::Get(Profile* profile) {
   return EasyUnlockServiceFactory::GetForProfile(profile);
 }
 
 EasyUnlockService::EasyUnlockService(Profile* profile)
-    : profile_(profile), weak_ptr_factory_(this) {
+    : profile_(profile),
+      weak_ptr_factory_(this) {
   extensions::ExtensionSystem::Get(profile_)->ready().Post(
       FROM_HERE,
       base::Bind(&EasyUnlockService::Initialize,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 EasyUnlockService::~EasyUnlockService() {
 }
 
 // static
@@ skipping 22 matching lines @@
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(extension_misc::kEasyUnlockAppId, false);
 
   OpenApplication(AppLaunchParams(
       profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
 }
 
 bool EasyUnlockService::IsAllowed() {
 #if defined(OS_CHROMEOS)
-  if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
+  if (!chromeos::UserManager::Get()->IsLoggedInAsRegularUser())
     return false;
 
   if (!chromeos::ProfileHelper::IsPrimaryProfile(profile_))
     return false;
 
   if (!profile_->GetPrefs()->GetBoolean(prefs::kEasyUnlockAllowed))
     return false;
 
   // It is only disabled when the trial exists and is in "Disable" group.
   return base::FieldTrialList::FindFullName("EasyUnlock") != "Disable";
 #else
   // TODO(xiyuan): Revisit when non-chromeos platforms are supported.
   return false;
 #endif
 }
 
+
+EasyUnlockScreenlockStateHandler*
+    EasyUnlockService::GetScreenlockStateHandler() {
+  return screenlock_state_handler_.get();
+}
+
 void EasyUnlockService::Initialize() {
   registrar_.Init(profile_->GetPrefs());
   registrar_.Add(
       prefs::kEasyUnlockAllowed,
       base::Bind(&EasyUnlockService::OnPrefsChanged, base::Unretained(this)));
   OnPrefsChanged();
 }
 
-void EasyUnlockService::LoadApp() {
+bool EasyUnlockService::LoadApp() {
   DCHECK(IsAllowed());
 
 #if defined(GOOGLE_CHROME_BUILD)
   base::FilePath easy_unlock_path;
 #if defined(OS_CHROMEOS)
   easy_unlock_path = base::FilePath("/usr/share/chromeos-assets/easy_unlock");
 #endif  // defined(OS_CHROMEOS)
 
 #ifndef NDEBUG
   // Only allow app path override switch for debug build.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) {
     easy_unlock_path =
         command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath);
   }
 #endif  // !defined(NDEBUG)
 
   if (!easy_unlock_path.empty()) {
-    GetComponentLoader(profile_)
+    std::string id = GetComponentLoader(profile_)
         ->Add(IDR_EASY_UNLOCK_MANIFEST, easy_unlock_path);
+    return !id.empty();
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
+
+  return false;
 }
 
 void EasyUnlockService::UnloadApp() {
   GetComponentLoader(profile_)->Remove(extension_misc::kEasyUnlockAppId);
 }
 
 void EasyUnlockService::OnPrefsChanged() {
-  if (IsAllowed())
-    LoadApp();
-  else
+  if (IsAllowed()) {
+    if (LoadApp()) {
+      // If the app is loaded, set up screenlock_state_handler_.
+      screenlock_state_handler_.reset(new EasyUnlockScreenlockStateHandler(
+          ScreenlockBridge::GetAuthenticatedUserEmail(profile_),

[xiyuan, 2014/08/12 21:51:49]

I would prefer to what we have in PS24, where |screenlock_state_handler_| is
lazily created. Maybe add a DCHECK() to make sure user email is set.

Doing this feels easy to break because the extension system init and setup
authenticated user is unrelated. The order might change in the future.

[tbarzic, 2014/08/12 22:12:52]

ok, reverting this back. I'll keep reset before UnloadApp (let me know if you'd
prefer to call ChangeState(STATE_INACTIVE) instead of reset).

[xiyuan, 2014/08/12 22:14:39]

Sounds good.

+          profile_->GetPrefs(),
+          ScreenlockBridge::Get()));
+    }
+  } else {
+    screenlock_state_handler_.reset();
     UnloadApp();
+  }
 }