Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4808)

Unified Diff: chrome/browser/chromeos/login/lock/views_screen_locker.cc

Issue 2923773003: Adding mojo calls for several lock screen related operations. (Closed)
Patch Set: clean up Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/lock/views_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/views_screen_locker.cc b/chrome/browser/chromeos/login/lock/views_screen_locker.cc
index b6ab223a3849915b602bfb325d2736b3bea8f20e..d666fe04b445907752903a2ce91f14c969ff399b 100644
--- a/chrome/browser/chromeos/login/lock/views_screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/views_screen_locker.cc
@@ -4,9 +4,23 @@
#include "chrome/browser/chromeos/login/lock/views_screen_locker.h"
+#include "base/i18n/time_formatting.h"
#include "base/metrics/histogram_macros.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/login/lock_screen_utils.h"
+#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
+#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
#include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
#include "chrome/browser/chromeos/login/user_selection_screen_proxy.h"
+#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
+#include "chrome/browser/chromeos/system/system_clock.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
+#include "chrome/common/pref_names.h"
+#include "components/proximity_auth/screenlock_bridge.h"
+#include "components/user_manager/known_user.h"
+#include "components/user_manager/user_manager.h"
+#include "google_apis/gaia/gaia_auth_util.h"
+#include "ui/base/ime/chromeos/ime_keyboard.h"
namespace chromeos {
@@ -21,6 +35,12 @@ ViewsScreenLocker::ViewsScreenLocker(ScreenLocker* screen_locker)
user_selection_screen_ =
base::MakeUnique<ChromeUserSelectionScreen>(kLockDisplay);
user_selection_screen_->SetView(user_selection_screen_proxy_.get());
+
+ allowed_input_methods_subscription_ =
+ CrosSettings::Get()->AddSettingsObserver(
+ kDeviceLoginScreenInputMethods,
+ base::Bind(&ViewsScreenLocker::OnAllowedInputMethodsChanged,
+ base::Unretained(this)));
}
ViewsScreenLocker::~ViewsScreenLocker() {
@@ -79,13 +99,52 @@ void ViewsScreenLocker::Init() {
user_selection_screen_->Init(screen_locker_->users());
LockScreenClient::Get()->LoadUsers(user_selection_screen_->PrepareUserList(),
false /* show_guests */);
+ if (!ime_state_.get())
+ ime_state_ = input_method::InputMethodManager::Get()->GetActiveIMEState();
+
+ // Reset Caps Lock state when lock screen is shown.
+ input_method::InputMethodManager::Get()->GetImeKeyboard()->SetCapsLockEnabled(
+ false);
+
+ // Enable pin for any users who can use it.
+ if (user_manager::UserManager::IsInitialized()) {
+ for (user_manager::User* user :
+ user_manager::UserManager::Get()->GetLoggedInUsers()) {
+ UpdatePinKeyboardState(user->GetAccountId());
+ }
+ }
}
void ViewsScreenLocker::OnLockScreenReady() {
+ lock_screen_ready_ = true;
user_selection_screen_->InitEasyUnlock();
UMA_HISTOGRAM_TIMES("LockScreen.LockReady",
base::TimeTicks::Now() - lock_time_);
screen_locker_->ScreenLockReady();
+ OnAllowedInputMethodsChanged();
+}
+
+void ViewsScreenLocker::HandleAuthenticateUser(
+ const AccountId& account_id,
+ const std::string& hashed_password,
+ bool authenticated_by_pin) {
+ DCHECK_EQ(account_id.GetUserEmail(),
+ gaia::SanitizeEmail(account_id.GetUserEmail()));
+ quick_unlock::QuickUnlockStorage* quick_unlock_storage =
+ quick_unlock::QuickUnlockFactory::GetForAccountId(account_id);
+ // If pin storage is unavailable, authenticated by PIN must be false.
jdufault 2017/06/08 21:12:06 nit: authenticated by PIN -> |authenticated_by_pin
xiaoyinh(OOO Sep 11-29) 2017/06/09 00:47:10 Done.
+ DCHECK(!quick_unlock_storage ||
+ quick_unlock_storage->IsPinAuthenticationAvailable() ||
+ !authenticated_by_pin);
+
+ UserContext user_context(account_id);
+ Key key(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, std::string(), hashed_password);
+ user_context.SetKey(key);
+ user_context.SetIsUsingPin(authenticated_by_pin);
+ if (account_id.GetAccountType() == AccountType::ACTIVE_DIRECTORY)
+ user_context.SetUserType(user_manager::USER_TYPE_ACTIVE_DIRECTORY);
+ ScreenLocker::default_screen_locker()->Authenticate(user_context);
+ UpdatePinKeyboardState(account_id);
}
void ViewsScreenLocker::HandleAttemptUnlock(const AccountId& account_id) {
@@ -101,4 +160,68 @@ void ViewsScreenLocker::HandleRecordClickOnLockIcon(
user_selection_screen_->RecordClickOnLockIcon(account_id);
}
+void ViewsScreenLocker::HandleFocusPod(const AccountId& account_id) {
+ proximity_auth::ScreenlockBridge::Get()->SetFocusedUser(account_id);
+ if (user_selection_screen_)
+ user_selection_screen_->CheckUserStatus(account_id);
+
+ focused_pod_account_id_ = base::MakeUnique<AccountId>(account_id);
+
+ const user_manager::User* user =
+ user_manager::UserManager::Get()->FindUser(account_id);
+ // |user| may be nullptr in kiosk mode or unit tests.
jdufault 2017/06/08 21:12:06 nit: null is preferred in comments
xiaoyinh(OOO Sep 11-29) 2017/06/09 00:47:11 Done.
+ if (user && user->is_logged_in() && !user->is_active()) {
+ SessionControllerClient::DoSwitchActiveUser(account_id);
+ } else {
+ lock_screen_utils::SetUserInputMethod(account_id.GetUserEmail(),
+ ime_state_.get());
+ lock_screen_utils::SetKeyboardSettings(account_id);
+ WallpaperManager::Get()->SetUserWallpaperDelayed(account_id);
+
+ bool use_24hour_clock = false;
+ if (user_manager::known_user::GetBooleanPref(
+ account_id, prefs::kUse24HourClock, &use_24hour_clock)) {
+ g_browser_process->platform_part()
+ ->GetSystemClock()
+ ->SetLastFocusedPodHourClockType(
+ use_24hour_clock ? base::k24HourClock : base::k12HourClock);
+ }
+ }
+}
+
+void ViewsScreenLocker::HandleNoPodFocused() {
+ focused_pod_account_id_.reset();
+ lock_screen_utils::EnforcePolicyInputMethods(std::string());
+}
+
+void ViewsScreenLocker::SuspendDone(const base::TimeDelta& sleep_duration) {
+ for (user_manager::User* user :
+ user_manager::UserManager::Get()->GetUnlockUsers()) {
+ UpdatePinKeyboardState(user->GetAccountId());
+ }
+}
+
+void ViewsScreenLocker::UpdatePinKeyboardState(const AccountId& account_id) {
+ quick_unlock::QuickUnlockStorage* quick_unlock_storage =
+ quick_unlock::QuickUnlockFactory::GetForAccountId(account_id);
+ if (!quick_unlock_storage)
+ return;
+
+ bool is_enabled = quick_unlock_storage->IsPinAuthenticationAvailable();
+ LockScreenClient::Get()->SetPinEnabledForUser(account_id, is_enabled);
+}
+
+void ViewsScreenLocker::OnAllowedInputMethodsChanged() {
+ if (!lock_screen_ready_)
+ return;
+
+ if (focused_pod_account_id_) {
+ std::string user_input_method = lock_screen_utils::GetUserLastInputMethod(
+ focused_pod_account_id_->GetUserEmail());
+ lock_screen_utils::EnforcePolicyInputMethods(user_input_method);
+ } else {
+ lock_screen_utils::EnforcePolicyInputMethods(std::string());
+ }
+}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698