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

Unified Diff: ash/system/chromeos/network/tray_network.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
« no previous file with comments | « ash/system/chromeos/network/tray_network.h ('k') | ash/system/chromeos/network/tray_sms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/tray_network.cc
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index a984d24b3ee34f91d0a562a11be3d9cc2043301a..e83e72c42e98ea81552c0c4690983668779bbeb8 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -254,7 +254,7 @@ TrayNetwork::~TrayNetwork() {
notifier->RemoveNetworkPortalDetectorObserver(this);
}
-views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
+views::View* TrayNetwork::CreateTrayView(LoginStatus status) {
CHECK(tray_ == NULL);
if (!chromeos::NetworkHandler::IsInitialized())
return NULL;
@@ -262,17 +262,16 @@ views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
return tray_;
}
-views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayNetwork::CreateDefaultView(LoginStatus status) {
CHECK(default_ == NULL);
if (!chromeos::NetworkHandler::IsInitialized())
return NULL;
CHECK(tray_ != NULL);
- default_ =
- new tray::NetworkDefaultView(this, status != user::LOGGED_IN_LOCKED);
+ default_ = new tray::NetworkDefaultView(this, status != LoginStatus::LOCKED);
return default_;
}
-views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
+views::View* TrayNetwork::CreateDetailedView(LoginStatus status) {
CHECK(detailed_ == NULL);
Shell::GetInstance()->metrics()->RecordUserMetricsAction(
ash::UMA_STATUS_AREA_DETAILED_NETWORK_VIEW);
@@ -301,8 +300,7 @@ void TrayNetwork::DestroyDetailedView() {
detailed_ = NULL;
}
-void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
-}
+void TrayNetwork::UpdateAfterLoginStatusChange(LoginStatus status) {}
void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
if (tray_) {
« no previous file with comments | « ash/system/chromeos/network/tray_network.h ('k') | ash/system/chromeos/network/tray_sms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698