diff options
Diffstat (limited to 'ash/system/tray/system_tray.cc')
| -rw-r--r-- | ash/system/tray/system_tray.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 8b09994..d225ce0 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -77,7 +77,7 @@ class SystemBubbleWrapper { views::View* anchor, TrayBubbleView::InitParams* init_params) { user::LoginStatus login_status = - Shell::GetInstance()->tray_delegate()->GetUserLoginStatus(); + Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); bubble_->InitView(anchor, login_status, init_params); bubble_wrapper_.reset( new internal::TrayBubbleWrapper(tray, bubble_->bubble_view())); @@ -158,14 +158,14 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) { AddTrayItem(new internal::TrayMonitor(this)); #endif - SetVisible(ash::Shell::GetInstance()->tray_delegate()-> + SetVisible(ash::Shell::GetInstance()->system_tray_delegate()-> GetTrayVisibilityOnStartup()); } void SystemTray::AddTrayItem(SystemTrayItem* item) { items_.push_back(item); - SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate(); + SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus()); item->UpdateAfterShelfAlignmentChange(shelf_alignment()); |