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

Unified Diff: ash/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 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: ash/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 7924ad9555f7f35e34e28f43ab433e1062d52192..1ffd95f6bfcf64b3318da1e643f68c998268b69c 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -294,7 +294,7 @@ class InfoThrobberLayout : public views::LayoutManager {
NetworkStateListDetailedView::NetworkStateListDetailedView(
SystemTrayItem* owner,
ListType list_type,
- user::LoginStatus login)
+ LoginStatus login)
: NetworkDetailedView(owner),
list_type_(list_type),
login_(login),
@@ -412,7 +412,7 @@ void NetworkStateListDetailedView::OnViewClicked(views::View* sender) {
return;
}
- if (login_ == user::LOGGED_IN_LOCKED)
+ if (login_ == LoginStatus::LOCKED)
return;
std::string service_path;
@@ -502,7 +502,7 @@ void NetworkStateListDetailedView::CreateHeaderEntry() {
}
void NetworkStateListDetailedView::CreateNetworkExtra() {
- if (login_ == user::LOGGED_IN_LOCKED)
+ if (login_ == LoginStatus::LOCKED)
return;
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ -660,7 +660,7 @@ bool NetworkStateListDetailedView::OrderChild(views::View* view, int index) {
}
void NetworkStateListDetailedView::UpdateNetworkExtra() {
- if (login_ == user::LOGGED_IN_LOCKED)
+ if (login_ == LoginStatus::LOCKED)
return;
View* layout_parent = nullptr; // All these buttons have the same parent.
@@ -718,7 +718,7 @@ void NetworkStateListDetailedView::CreateSettingsEntry() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
bool show_settings =
ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings();
- if (login_ != user::LOGGED_IN_NONE) {
+ if (login_ != LoginStatus::NOT_LOGGED_IN) {
// Allow user access settings only if user is logged in
// and showing settings is allowed. There're situations (supervised user
// creation flow) when session is started but UI flow continues within
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.h ('k') | ash/system/chromeos/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698