| Index: ash/wm/toplevel_window_event_handler.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
|
| index 156ff04472de54e73176fbff535b03369845f0c5..09bcba4421b8758114fd28841ab4ddea9e2c9233 100644
|
| --- a/ash/wm/toplevel_window_event_handler.cc
|
| +++ b/ash/wm/toplevel_window_event_handler.cc
|
| @@ -104,8 +104,8 @@ class ToplevelWindowEventHandler::ScopedWindowResizer
|
| virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
|
|
|
| // WindowStateObserver overrides:
|
| - virtual void OnWindowShowTypeChanged(wm::WindowState* window_state,
|
| - wm::WindowShowType type) OVERRIDE;
|
| + virtual void OnPreWindowShowTypeChange(wm::WindowState* window_state,
|
| + wm::WindowShowType type) OVERRIDE;
|
|
|
| private:
|
| ToplevelWindowEventHandler* handler_;
|
| @@ -144,7 +144,8 @@ void ToplevelWindowEventHandler::ScopedWindowResizer::OnWindowHierarchyChanging(
|
| handler_->CompleteDrag(DRAG_COMPLETE);
|
| }
|
|
|
| -void ToplevelWindowEventHandler::ScopedWindowResizer::OnWindowShowTypeChanged(
|
| +void
|
| +ToplevelWindowEventHandler::ScopedWindowResizer::OnPreWindowShowTypeChange(
|
| wm::WindowState* window_state,
|
| wm::WindowShowType old) {
|
| handler_->CompleteDrag(DRAG_COMPLETE);
|
|
|