mash: remove more shell/shelf WmWindow usage.

ash/system/tray/system_tray_controller.cc

 // Copyright 2016 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/tray/system_tray_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 133 matching lines @@
 void SystemTrayController::BindRequest(mojom::SystemTrayRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void SystemTrayController::SetClient(mojom::SystemTrayClientPtr client) {
   system_tray_client_ = std::move(client);
 }
 
 void SystemTrayController::SetPrimaryTrayEnabled(bool enabled) {
   ash::SystemTray* tray =
-      ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+      Shell::GetPrimaryRootWindowController()->GetSystemTray();
   if (!tray)
     return;
 
   // We disable the UI to prevent user from interacting with UI elements,
   // particularly with the system tray menu. However, in case if the system tray
   // bubble is opened at this point, it remains opened and interactive even
   // after SystemTray::SetEnabled(false) call, which can be dangerous
   // (http://crbug.com/497080). Close the menu to fix it. Calling
   // SystemTray::SetEnabled(false) guarantees, that the menu will not be opened
   // until the UI is enabled again.
   if (!enabled && tray->HasSystemBubble())
     tray->CloseSystemBubble();
 
   tray->SetEnabled(enabled);
 }
 
 void SystemTrayController::SetPrimaryTrayVisible(bool visible) {
   ash::SystemTray* tray =
-      ShellPort::Get()->GetPrimaryRootWindowController()->GetSystemTray();
+      Shell::GetPrimaryRootWindowController()->GetSystemTray();
   if (!tray)
     return;
 
   tray->SetVisible(visible);
   tray->GetWidget()->SetOpacity(visible ? 1.f : 0.f);
   if (visible) {
     tray->GetWidget()->Show();
   } else {
     tray->GetWidget()->Hide();
   }
@@ skipping 20 matching lines @@
     ash::SystemTray* tray = root->GetSystemTray();
     // External monitors might not have a tray yet.
     if (!tray)
       continue;
     tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required,
                                         update_type);
   }
 }
 
 }  // namespace ash