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

Unified Diff: chromeos/network/network_connection_handler.cc

Issue 23684033: Fix device policy recovery on CrOS login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 | « chromeos/network/network_connection_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index dfcba54c2f219f3bc980787e23475a167308bd80..6600e56e0e16ddddecfa3f2f36cf9ab4a291f2d2 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -157,8 +157,7 @@ void NetworkConnectionHandler::Init(
NetworkConfigurationHandler* network_configuration_handler) {
if (LoginState::IsInitialized()) {
LoginState::Get()->AddObserver(this);
- logged_in_ =
- LoginState::Get()->GetLoggedInState() == LoginState::LOGGED_IN_ACTIVE;
+ logged_in_ = LoginState::Get()->IsUserLoggedIn();
}
if (CertLoader::IsInitialized()) {
cert_loader_ = CertLoader::Get();
@@ -175,9 +174,8 @@ void NetworkConnectionHandler::Init(
network_configuration_handler_ = network_configuration_handler;
}
-void NetworkConnectionHandler::LoggedInStateChanged(
- LoginState::LoggedInState state) {
- if (state == LoginState::LOGGED_IN_ACTIVE) {
+void NetworkConnectionHandler::LoggedInStateChanged() {
+ if (LoginState::Get()->IsUserLoggedIn()) {
logged_in_ = true;
NET_LOG_EVENT("Logged In", "");
}
« no previous file with comments | « chromeos/network/network_connection_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698