mash: Move SystemTrayDelegate ownership to WmShell

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 130 matching lines @@
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 struct ShellInitParams;
 class SlowAnimationEventFilter;
 class StatusAreaWidget;
 class StickyKeysController;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class SystemTray;
 class SystemTrayDelegate;

[msw, 2016/06/10 18:48:20]

nit: remove

[James Cook, 2016/06/10 20:20:29]

Done.

 class SystemTrayNotifier;
 class ToastManager;
 class ToplevelWindowEventHandler;
 class TouchTransformerController;
 class TouchObserverHUD;
 class UserWallpaperDelegate;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
 class VideoDetector;
 class WebNotificationTray;
@@ skipping 326 matching lines @@
 
   // Returns WebNotificationTray on the primary root window.
   WebNotificationTray* GetWebNotificationTray();
 
   // Does the primary display have status area?
   bool HasPrimaryStatusArea();
 
   // Returns the system tray on primary display.
   SystemTray* GetPrimarySystemTray();
 
-  SystemTrayDelegate* system_tray_delegate() {
-    return system_tray_delegate_.get();
-  }
-
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   ResizeShadowController* resize_shadow_controller() {
     return resize_shadow_controller_.get();
@@ skipping 146 matching lines @@
   aura::Window* scoped_target_root_window_;
 
   // The CompoundEventFilter owned by aura::Env object.
   std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<ShellDelegate> delegate_;
-  std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<NewWindowDelegate> new_window_delegate_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<ContainerDelegate> container_delegate_;
   std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
@@ skipping 113 matching lines @@
   bool in_mus_ = false;
 
   std::unique_ptr<KeyboardUI> keyboard_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_