[mus+ash] Removes WmWindow from ash/wm/root_window_finder.h

ash/frame/caption_buttons/frame_size_button.cc

 // Copyright 2014 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/frame/caption_buttons/frame_size_button.h"
 
 #include "ash/shell_port.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm/workspace/phantom_window_controller.h"
-#include "ash/wm_window.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 184 matching lines @@
       case CAPTION_BUTTON_ICON_LOCATION:
       case CAPTION_BUTTON_ICON_COUNT:
         NOTREACHED();
         break;
     }
   }
 
   if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) {
     aura::Window* window = frame_->GetNativeWindow();
     if (!phantom_window_controller_.get()) {
-      phantom_window_controller_.reset(
-          new PhantomWindowController(WmWindow::Get(window)));
+      phantom_window_controller_.reset(new PhantomWindowController(window));
     }
     gfx::Rect phantom_bounds_in_screen =
         (snap_type_ == SNAP_LEFT)
             ? wm::GetDefaultLeftSnappedWindowBoundsInParent(window)
             : wm::GetDefaultRightSnappedWindowBoundsInParent(window);
     ::wm::ConvertRectToScreen(window->parent(), &phantom_bounds_in_screen);
     phantom_window_controller_->Show(phantom_bounds_in_screen);
   } else {
     phantom_window_controller_.reset();
   }
@@ skipping 10 matching lines @@
   }
   return NULL;
 }
 
 bool FrameSizeButton::CommitSnap(const ui::LocatedEvent& event) {
   // The position of |event| may be different than the position of the previous
   // event.
   UpdateSnapType(event);
 
   if (in_snap_mode_ && (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT)) {
-    WmWindow* window = WmWindow::Get(frame_->GetNativeWindow());
-    wm::WindowState* window_state = window->GetWindowState();
+    wm::WindowState* window_state =
+        wm::GetWindowState(frame_->GetNativeWindow());
     const wm::WMEvent snap_event(snap_type_ == SNAP_LEFT
                                      ? wm::WM_EVENT_SNAP_LEFT
                                      : wm::WM_EVENT_SNAP_RIGHT);
     window_state->OnWMEvent(&snap_event);
     ShellPort::Get()->RecordUserMetricsAction(
         snap_type_ == SNAP_LEFT ? UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_LEFT
                                 : UMA_WINDOW_MAXIMIZE_BUTTON_MAXIMIZE_RIGHT);
     SetButtonsToNormalMode(FrameSizeButtonDelegate::ANIMATE_NO);
     return true;
   }
   SetButtonsToNormalMode(FrameSizeButtonDelegate::ANIMATE_YES);
   return false;
 }
 
 void FrameSizeButton::SetButtonsToNormalMode(
     FrameSizeButtonDelegate::Animate animate) {
   in_snap_mode_ = false;
   snap_type_ = SNAP_NONE;
   set_buttons_to_snap_mode_timer_.Stop();
   delegate_->SetButtonsToNormal(animate);
   phantom_window_controller_.reset();
 }
 
 }  // namespace ash