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

Unified Diff: components/proximity_auth/screenlock_bridge.cc

Issue 1377313002: Revert of Hook up ProximityAuthSystem in EasyUnlockService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth_connection
Patch Set: Created 5 years, 3 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
« no previous file with comments | « components/proximity_auth/screenlock_bridge.h ('k') | components/proximity_auth/unlock_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/proximity_auth/screenlock_bridge.cc
diff --git a/components/proximity_auth/screenlock_bridge.cc b/components/proximity_auth/screenlock_bridge.cc
index c919693262880322d3d54a003f2f1462fa81aadf..029e0b781e734f607f6fce85f2c9bf2338537c84 100644
--- a/components/proximity_auth/screenlock_bridge.cc
+++ b/components/proximity_auth/screenlock_bridge.cc
@@ -4,8 +4,8 @@
#include "components/proximity_auth/screenlock_bridge.h"
+#include "base/logging.h"
#include "base/strings/string16.h"
-#include "components/proximity_auth/logging/logging.h"
#if defined(OS_CHROMEOS)
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -131,7 +131,6 @@
else
screen_type = lock_handler->GetScreenType();
- focused_user_id_ = std::string();
lock_handler_ = lock_handler;
if (lock_handler_)
FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidLock(screen_type));
@@ -142,13 +141,8 @@
void ScreenlockBridge::SetFocusedUser(const std::string& user_id) {
if (user_id == focused_user_id_)
return;
- PA_LOG(INFO) << "Focused user changed to " << user_id;
focused_user_id_ = user_id;
FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id));
-}
-
-std::string ScreenlockBridge::GetFocusedUser() {
- return focused_user_id_;
}
bool ScreenlockBridge::IsLocked() const {
« no previous file with comments | « components/proximity_auth/screenlock_bridge.h ('k') | components/proximity_auth/unlock_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698