Makes functions in container_finder take aura::Window

ash/system/tray/tray_event_filter.cc

Index: ash/system/tray/tray_event_filter.cc
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
index df42c1b41b9326d61a88278935298daabaf859e5..f537d77839be79de50cc8a34aa48e5035958c33f 100644
--- a/ash/system/tray/tray_event_filter.cc
+++ b/ash/system/tray/tray_event_filter.cc
@@ -9,7 +9,6 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/wm/container_finder.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
@@ -47,8 +46,8 @@ void TrayEventFilter::OnPointerEventObserved(
 void TrayEventFilter::ProcessPressedEvent(const gfx::Point& location_in_screen,
                                           views::Widget* target) {
   if (target) {
-    WmWindow* window = WmWindow::Get(target->GetNativeWindow());
-    int container_id = wm::GetContainerForWindow(window)->aura_window()->id();
+    aura::Window* window = target->GetNativeWindow();
+    int container_id = wm::GetContainerForWindow(window)->id();
     // Don't process events that occurred inside an embedded menu, for example
     // the right-click menu in a popup notification.
     if (container_id == kShellWindowId_MenuContainer)
@@ -56,7 +55,7 @@ void TrayEventFilter::ProcessPressedEvent(const gfx::Point& location_in_screen,
     // Don't process events that occurred inside a popup notification
     // from message center.
     if (container_id == kShellWindowId_StatusContainer &&
-        window->GetType() == ui::wm::WINDOW_TYPE_POPUP &&
+        window->type() == ui::wm::WINDOW_TYPE_POPUP &&
         target->IsAlwaysOnTop()) {
       return;
     }