Convert TrayEventFilter to wm common types

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 71 matching lines @@
 
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class AppListController;
 class AshNativeCursorManager;
 class AutoclickController;
 class BluetoothNotificationController;
 class CaptureController;
-class ContainerDelegate;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
 class DisplayColorManager;
 class DisplayConfigurationController;
 class WindowTreeHostManager;
 class DisplayErrorObserver;
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
@@ skipping 303 matching lines @@
   }
 
   NewWindowDelegate* new_window_delegate() {
     return new_window_delegate_.get();
   }
 
   MediaDelegate* media_delegate() {
     return media_delegate_.get();
   }
 
-  ContainerDelegate* container_delegate() { return container_delegate_.get(); }
-
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   MagnificationController* magnification_controller() {
     return magnification_controller_.get();
   }
 
   PartialMagnificationController* partial_magnification_controller() {
     return partial_magnification_controller_.get();
@@ skipping 220 matching lines @@
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<ShellDelegate> 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_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
 
   std::unique_ptr<ShelfModel> shelf_model_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
@@ skipping 106 matching lines @@
   bool in_mus_ = false;
 
   std::unique_ptr<KeyboardUI> keyboard_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_