mash: Remove StatusAreaWidget references from system tray classes

ash/system/status_area_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/status_area_widget.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/web_notification/web_notification_tray.h"
+#include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
-#include "ash/system/web_notification/web_notification_tray.h"
-#include "ash/wm/window_properties.h"
 #include "base/i18n/time_formatting.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/session/logout_button_tray.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 #endif
 
 namespace ash {
 
 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
@@ skipping 28 matching lines @@
   AddSystemTray();
   AddWebNotificationTray();
 #if defined(OS_CHROMEOS)
   AddLogoutButtonTray();
   AddVirtualKeyboardTray();
 #endif
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   DCHECK(delegate);
   // Initialize after all trays have been created.
-  system_tray_->InitializeTrayItems(delegate);
+  system_tray_->InitializeTrayItems(delegate, web_notification_tray_);
   web_notification_tray_->Initialize();
 #if defined(OS_CHROMEOS)
   logout_button_tray_->Initialize();
   virtual_keyboard_tray_->Initialize();
 #endif
   overview_button_tray_->Initialize();
   SetShelfAlignment(system_tray_->shelf_alignment());
   UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::Shutdown() {
+  system_tray_->Shutdown();
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
+  // Must be destroyed after |web_notification_tray_|.

[msw, 2016/06/27 23:57:36]

It's a bit odd to call this out and also need to specifically Shutdown
|system_tray_| before destroying |web_notification_tray_|, but I guess the two
depend on each other. Can we instead access
RootWindowController::GetSystemTray() from WebNotificationTray or similar?
Otherwise, I don't have any helpful ideas and this is probably fine...

[James Cook, 2016/06/28 00:47:25]

Discussed offline. Both SystemTray and WebNotificationTray need to be able to
push data into each other. We're going to go with this, but clarify in
SystemTray what it's doing with WebNotificationTray.

   delete system_tray_;
   system_tray_ = NULL;
 #if defined(OS_CHROMEOS)
   delete virtual_keyboard_tray_;
   virtual_keyboard_tray_ = NULL;
   delete logout_button_tray_;
   logout_button_tray_ = NULL;
 #endif
   delete overview_button_tray_;
   overview_button_tray_ = NULL;
@@ skipping 42 matching lines @@
   Widget::OnMouseEvent(event);
   wm_shelf_->UpdateAutoHideForMouseEvent(event);
 }
 
 void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) {
   Widget::OnGestureEvent(event);
   wm_shelf_->UpdateAutoHideForGestureEvent(event);
 }
 
 void StatusAreaWidget::AddSystemTray() {
-  system_tray_ = new SystemTray(this);
+  system_tray_ = new SystemTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(system_tray_);
 }
 
 void StatusAreaWidget::AddWebNotificationTray() {
-  web_notification_tray_ = new WebNotificationTray(this);
+  DCHECK(system_tray_);
+  web_notification_tray_ = new WebNotificationTray(
+      wm_shelf_, WmLookup::Get()->GetWindowForWidget(this), system_tray_);
   status_area_widget_delegate_->AddTray(web_notification_tray_);
 }
 
 #if defined(OS_CHROMEOS)
 void StatusAreaWidget::AddLogoutButtonTray() {
-  logout_button_tray_ = new LogoutButtonTray(this);
+  logout_button_tray_ = new LogoutButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(logout_button_tray_);
 }
 
 void StatusAreaWidget::AddVirtualKeyboardTray() {
-  virtual_keyboard_tray_ = new VirtualKeyboardTray(this);
+  virtual_keyboard_tray_ = new VirtualKeyboardTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(virtual_keyboard_tray_);
 }
 #endif
 
 void StatusAreaWidget::AddOverviewButtonTray() {
-  overview_button_tray_ = new OverviewButtonTray(this);
+  overview_button_tray_ = new OverviewButtonTray(wm_shelf_);
   status_area_widget_delegate_->AddTray(overview_button_tray_);
 }
 
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
   status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
     system_tray_->SetShelfAlignment(alignment);
   if (web_notification_tray_)
     web_notification_tray_->SetShelfAlignment(alignment);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->SetShelfAlignment(alignment);
   if (virtual_keyboard_tray_)
     virtual_keyboard_tray_->SetShelfAlignment(alignment);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->SetShelfAlignment(alignment);
   status_area_widget_delegate_->UpdateLayout();
 }
 
-void StatusAreaWidget::SetHideSystemNotifications(bool hide) {
-  if (system_tray_)
-    system_tray_->SetHideNotifications(hide);
-}
-
 void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) {
   if (login_status_ == login_status)
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace ash