mash: Migrate remaining tray observers and notify functions.

ash/common/wm_shell.h

 // 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 class DisplayInfo;
 class FocusCycler;
 class MruWindowTracker;
 class SessionStateDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmSystemTrayNotifier;
+class SystemTrayNotifier;
 class WmWindow;
 
 namespace wm {
 class WindowState;
 }
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
-  WmSystemTrayNotifier* system_tray_notifier() {
+  SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
   WindowSelectorController* window_selector_controller() {
     return window_selector_controller_.get();
   }
@@ skipping 104 matching lines @@
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
 
   void DeleteWindowSelectorController();
 
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
   std::unique_ptr<FocusCycler> focus_cycler_;
-  std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_;
+  std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_