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

Unified Diff: ash/system/chromeos/network/tray_vpn.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_vpn.h ('k') | ash/system/chromeos/power/tray_power.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/tray_vpn.cc
diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc
index 3f69bef281ec73c945bea7513d4b02000b9474e8..b37122462ce2e1cd2d93275c8fddec7ea2cd9117 100644
--- a/ash/system/chromeos/network/tray_vpn.cc
+++ b/ash/system/chromeos/network/tray_vpn.cc
@@ -120,15 +120,15 @@ TrayVPN::TrayVPN(SystemTray* system_tray)
TrayVPN::~TrayVPN() {
}
-views::View* TrayVPN::CreateTrayView(user::LoginStatus status) {
+views::View* TrayVPN::CreateTrayView(LoginStatus status) {
return NULL;
}
-views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
+views::View* TrayVPN::CreateDefaultView(LoginStatus status) {
CHECK(default_ == NULL);
if (!chromeos::NetworkHandler::IsInitialized())
return NULL;
- if (status == user::LOGGED_IN_NONE)
+ if (status == LoginStatus::NOT_LOGGED_IN)
return NULL;
if (!tray::VpnDefaultView::ShouldShow())
return NULL;
@@ -138,12 +138,12 @@ views::View* TrayVPN::CreateDefaultView(user::LoginStatus status) {
->IsInSecondaryLoginScreen();
default_ = new tray::VpnDefaultView(
- this, status != user::LOGGED_IN_LOCKED && !userAddingRunning);
+ this, status != LoginStatus::LOCKED && !userAddingRunning);
return default_;
}
-views::View* TrayVPN::CreateDetailedView(user::LoginStatus status) {
+views::View* TrayVPN::CreateDetailedView(LoginStatus status) {
CHECK(detailed_ == NULL);
if (!chromeos::NetworkHandler::IsInitialized())
return NULL;
@@ -167,8 +167,7 @@ void TrayVPN::DestroyDetailedView() {
detailed_ = NULL;
}
-void TrayVPN::UpdateAfterLoginStatusChange(user::LoginStatus status) {
-}
+void TrayVPN::UpdateAfterLoginStatusChange(LoginStatus status) {}
void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
« no previous file with comments | « ash/system/chromeos/network/tray_vpn.h ('k') | ash/system/chromeos/power/tray_power.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698