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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 9812043: aura: Uber tray should not show up on start screen in kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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: {
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698