OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/proximity_auth/screenlock_bridge.h" | 5 #include "components/proximity_auth/screenlock_bridge.h" |
6 | 6 |
| 7 #include "base/logging.h" |
7 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
8 #include "components/proximity_auth/logging/logging.h" | |
9 | 9 |
10 #if defined(OS_CHROMEOS) | 10 #if defined(OS_CHROMEOS) |
11 #include "chromeos/dbus/dbus_thread_manager.h" | 11 #include "chromeos/dbus/dbus_thread_manager.h" |
12 #include "chromeos/dbus/session_manager_client.h" | 12 #include "chromeos/dbus/session_manager_client.h" |
13 #endif | 13 #endif |
14 | 14 |
15 namespace proximity_auth { | 15 namespace proximity_auth { |
16 namespace { | 16 namespace { |
17 | 17 |
18 base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_instance = | 18 base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_instance = |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 return; | 124 return; |
125 | 125 |
126 // TODO(isherman): If |lock_handler| is null, then |lock_handler_| might have | 126 // TODO(isherman): If |lock_handler| is null, then |lock_handler_| might have |
127 // been freed. Cache the screen type rather than querying it below. | 127 // been freed. Cache the screen type rather than querying it below. |
128 LockHandler::ScreenType screen_type; | 128 LockHandler::ScreenType screen_type; |
129 if (lock_handler_) | 129 if (lock_handler_) |
130 screen_type = lock_handler_->GetScreenType(); | 130 screen_type = lock_handler_->GetScreenType(); |
131 else | 131 else |
132 screen_type = lock_handler->GetScreenType(); | 132 screen_type = lock_handler->GetScreenType(); |
133 | 133 |
134 focused_user_id_ = std::string(); | |
135 lock_handler_ = lock_handler; | 134 lock_handler_ = lock_handler; |
136 if (lock_handler_) | 135 if (lock_handler_) |
137 FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidLock(screen_type)); | 136 FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidLock(screen_type)); |
138 else | 137 else |
139 FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidUnlock(screen_type)); | 138 FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidUnlock(screen_type)); |
140 } | 139 } |
141 | 140 |
142 void ScreenlockBridge::SetFocusedUser(const std::string& user_id) { | 141 void ScreenlockBridge::SetFocusedUser(const std::string& user_id) { |
143 if (user_id == focused_user_id_) | 142 if (user_id == focused_user_id_) |
144 return; | 143 return; |
145 PA_LOG(INFO) << "Focused user changed to " << user_id; | |
146 focused_user_id_ = user_id; | 144 focused_user_id_ = user_id; |
147 FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id)); | 145 FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id)); |
148 } | 146 } |
149 | 147 |
150 std::string ScreenlockBridge::GetFocusedUser() { | |
151 return focused_user_id_; | |
152 } | |
153 | |
154 bool ScreenlockBridge::IsLocked() const { | 148 bool ScreenlockBridge::IsLocked() const { |
155 return lock_handler_ != nullptr; | 149 return lock_handler_ != nullptr; |
156 } | 150 } |
157 | 151 |
158 void ScreenlockBridge::Lock() { | 152 void ScreenlockBridge::Lock() { |
159 #if defined(OS_CHROMEOS) | 153 #if defined(OS_CHROMEOS) |
160 chromeos::SessionManagerClient* session_manager = | 154 chromeos::SessionManagerClient* session_manager = |
161 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); | 155 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); |
162 session_manager->RequestLockScreen(); | 156 session_manager->RequestLockScreen(); |
163 #else | 157 #else |
(...skipping 14 matching lines...) Expand all Loading... |
178 observers_.RemoveObserver(observer); | 172 observers_.RemoveObserver(observer); |
179 } | 173 } |
180 | 174 |
181 ScreenlockBridge::ScreenlockBridge() : lock_handler_(nullptr) { | 175 ScreenlockBridge::ScreenlockBridge() : lock_handler_(nullptr) { |
182 } | 176 } |
183 | 177 |
184 ScreenlockBridge::~ScreenlockBridge() { | 178 ScreenlockBridge::~ScreenlockBridge() { |
185 } | 179 } |
186 | 180 |
187 } // namespace proximity_auth | 181 } // namespace proximity_auth |
OLD | NEW |