Removes a couple more functions from WmWindow

ash/system/tray/tray_event_filter.cc

 // 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.
 
 #include "ash/system/tray/tray_event_filter.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell_port.h"
 #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"
 
 namespace ash {
 
 TrayEventFilter::TrayEventFilter() {}
 
 TrayEventFilter::~TrayEventFilter() {
   DCHECK(wrappers_.empty());
 }
 
@@ skipping 17 matching lines @@
     const gfx::Point& location_in_screen,
     views::Widget* target) {
   if (event.type() == ui::ET_POINTER_DOWN)
     ProcessPressedEvent(location_in_screen, target);
 }
 
 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)->GetShellWindowId();
+    int container_id = wm::GetContainerForWindow(window)->aura_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)
       return;
     // 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 &&
         target->IsAlwaysOnTop()) {
       return;
@@ skipping 26 matching lines @@
 
   // Close all bubbles other than the one a user clicked on the tray
   // or its bubble.
   for (std::set<TrayBackgroundView*>::iterator iter = trays.begin();
        iter != trays.end(); ++iter) {
     (*iter)->ClickedOutsideBubble();
   }
 }
 
 }  // namespace ash