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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 years, 7 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 | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index d7017a84b5dcb5aa19493d47e3feff870bcb2c9f..95591798c1e84c0959c8692c9bb66c218d511bcc 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -104,7 +104,8 @@ SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
// Register notifications on construction so that events such as
// PROFILE_CREATED do not get missed if they happen before Initialize().
registrar_.reset(new content::NotificationRegistrar);
- if (GetUserLoginStatus() == ash::LoginStatus::NOT_LOGGED_IN) {
+ if (SystemTrayClient::GetUserLoginStatus() ==
+ ash::LoginStatus::NOT_LOGGED_IN) {
registrar_->Add(this,
chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources());
@@ -164,10 +165,6 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
StopObservingAppWindowRegistry();
}
-ash::LoginStatus SystemTrayDelegateChromeOS::GetUserLoginStatus() const {
- return SystemTrayClient::GetUserLoginStatus();
-}
-
void SystemTrayDelegateChromeOS::ShowUserLogin() {
if (!ash::Shell::Get()->shell_delegate()->IsMultiProfilesEnabled())
return;
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698