| Index: ash/frame/caption_buttons/frame_size_button.cc
|
| diff --git a/ash/frame/caption_buttons/frame_size_button.cc b/ash/frame/caption_buttons/frame_size_button.cc
|
| index 59ce4291072b8224b20148fefa53f1002ec92401..a98ba8cba1204b353af8c9ab595509fd52fcee0c 100644
|
| --- a/ash/frame/caption_buttons/frame_size_button.cc
|
| +++ b/ash/frame/caption_buttons/frame_size_button.cc
|
| @@ -9,7 +9,6 @@
|
| #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"
|
| @@ -214,8 +213,7 @@ void FrameSizeButton::UpdateSnapType(const ui::LocatedEvent& event) {
|
| 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)
|
| @@ -246,8 +244,8 @@ bool FrameSizeButton::CommitSnap(const ui::LocatedEvent& 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);
|
|
|