Skip to content

Commit

Permalink
Remove LoginState from src/ash
Browse files Browse the repository at this point in the history
Bug: none
Change-Id: I09d1db6bee2b6f1fb47fcbbc1ace22f743317410
Reviewed-on: https://chromium-review.googlesource.com/853192
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527451}
  • Loading branch information
stevenjb authored and Commit Bot committed Jan 6, 2018
1 parent 903fd68 commit b0c0987
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions ash/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ include_rules = [
"+chromeos/dbus/shill_device_client.h",
"+chromeos/dbus/system_clock_client.h",
"+chromeos/login",
# LoginState is deprecated and is not instantiated in mash.
"-chromeos/login/login_state.h",
# TODO(jamescook): Eliminate this. http://crbug.com/644355
"+chromeos/network",
# TODO(jamescook): Eliminate this. http://crbug.com/644361
Expand Down
4 changes: 1 addition & 3 deletions ash/system/network/network_list.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "base/strings/utf_string_conversions.h"
#include "base/timer/timer.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/login/login_state.h"
#include "chromeos/network/device_state.h"
#include "chromeos/network/managed_network_configuration_handler.h"
#include "chromeos/network/network_state.h"
Expand Down Expand Up @@ -67,7 +66,6 @@

#include "ui/views/view.h"

using chromeos::LoginState;
using chromeos::NetworkHandler;
using chromeos::NetworkStateHandler;
using chromeos::ManagedNetworkConfigurationHandler;
Expand All @@ -84,7 +82,7 @@ const int kPowerStatusPaddingRight = 10;
bool IsProhibitedByPolicy(const chromeos::NetworkState* network) {
if (!NetworkTypePattern::WiFi().MatchesType(network->type()))
return false;
if (!LoginState::IsInitialized() || !LoginState::Get()->IsUserLoggedIn())
if (!Shell::Get()->session_controller()->IsActiveUserSessionStarted())
return false;
ManagedNetworkConfigurationHandler* managed_configuration_handler =
NetworkHandler::Get()->managed_network_configuration_handler();
Expand Down

0 comments on commit b0c0987

Please sign in to comment.