summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 16:26:06 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 16:26:06 +0000
commit1287353ceb17b7a4fa886b770406d24e5ef15453 (patch)
tree7abc4f9d4569f36db16e7eb100baebdda988af74 /ash
parentbd59c695ce30ec87bcccfc84365a89893d630e53 (diff)
downloadchromium_src-1287353ceb17b7a4fa886b770406d24e5ef15453.zip
chromium_src-1287353ceb17b7a4fa886b770406d24e5ef15453.tar.gz
chromium_src-1287353ceb17b7a4fa886b770406d24e5ef15453.tar.bz2
Send a NotifyEnterpriseDomainChanged from SystemTrayDelegate::Initialize
This is necessary to ensure proper visibility of the enterprise tray item on enterprise-managed devices, because the enterprise tray item is created and initialized before SystemTrayDelegate::Initialize() gets called. Thus, the item always starts out hidden and needs a notification to become visible. BUG=chromium-os:35755 TEST=Manual: Enroll device, reboot, check that the systray icon shows. TBR=nkostylev@chromium.org Review URL: https://chromiumcodereview.appspot.com/11742004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/enterprise/tray_enterprise.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.cc b/ash/system/chromeos/enterprise/tray_enterprise.cc
index 244c327..592eb64 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.cc
+++ b/ash/system/chromeos/enterprise/tray_enterprise.cc
@@ -70,7 +70,8 @@ views::View* EnterpriseDefaultView::CreateChildView(
}
TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
- : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ENTERPRISE_LIGHT) {
+ : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ENTERPRISE_LIGHT),
+ default_view_(NULL) {
Shell::GetInstance()->system_tray_notifier()->
AddEnterpriseDomainObserver(this);
}