Convert TrayEventFilter to wm common types

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 65b3baadc26c67f843228d1cad89241a9aca5148..a7057d3ef65ed10a2d6e7e0289a968868f1350c4 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -89,7 +89,6 @@ class AshNativeCursorManager;
 class AutoclickController;
 class BluetoothNotificationController;
 class CaptureController;
-class ContainerDelegate;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
 class DisplayColorManager;
@@ -413,8 +412,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
     return media_delegate_.get();
   }
 
-  ContainerDelegate* container_delegate() { return container_delegate_.get(); }
-
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
@@ -655,7 +652,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   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_;