Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
index b538e307150e6202f432eca26b2754398b290319..80a147b370c4c8175b72da3fdead0b0a6162d42d 100644 |
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
@@ -30,6 +30,7 @@ |
#include "chrome/browser/chromeos/input_method/input_method_util.h" |
#include "chrome/browser/chromeos/input_method/input_method_whitelist.h" |
#include "chrome/browser/chromeos/input_method/xkeyboard.h" |
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" |
#include "chrome/browser/chromeos/login/base_login_display_host.h" |
#include "chrome/browser/chromeos/login/login_display_host.h" |
#include "chrome/browser/chromeos/login/user.h" |
@@ -135,6 +136,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this); |
} |
+ virtual bool GetTrayVisibilityOnStartup() OVERRIDE { |
+ return !chromeos::KioskModeHelper::IsKioskModeEnabled(); |
sadrul
2012/03/22 04:15:36
Does this work correctly if you login (in kiosk mo
varunjain
2012/03/22 04:19:38
Seems to work.
|
+ } |
+ |
// Overridden from ash::SystemTrayDelegate: |
virtual const std::string GetUserDisplayName() const OVERRIDE { |
return UserManager::Get()->GetLoggedInUser().GetDisplayName(); |
@@ -522,6 +527,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
switch (type) { |
case chrome::NOTIFICATION_LOGIN_USER_CHANGED: { |
tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus()); |
sadrul
2012/03/22 04:15:36
Update visibility in SystemTray::UpdateAfterLoginS
varunjain
2012/03/22 04:19:38
Done.
|
+ // If tray is not initially visible, show it now that we have logged in. |
+ if (!GetTrayVisibilityOnStartup()) |
+ tray_->SetVisible(true); |
break; |
} |
case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: { |