| Index: ash/accelerators/accelerator_commands_aura.cc
|
| diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
|
| index d8f39d21fa98695bc38bb962d211bf67827ade9d..ed79a48d75b1fe057033119911d449d46fa76e77 100644
|
| --- a/ash/accelerators/accelerator_commands_aura.cc
|
| +++ b/ash/accelerators/accelerator_commands_aura.cc
|
| @@ -7,7 +7,6 @@
|
| #include "ash/shell.h"
|
| #include "ash/wm/screen_pinning_controller.h"
|
| #include "ash/wm/window_state.h"
|
| -#include "ash/wm_window.h"
|
| #include "base/metrics/user_metrics.h"
|
| #include "ui/display/manager/display_manager.h"
|
| #include "ui/display/manager/managed_display_info.h"
|
| @@ -44,10 +43,10 @@ void ResetInternalDisplayZoom() {
|
| }
|
|
|
| void Unpin() {
|
| - WmWindow* pinned_window =
|
| + aura::Window* pinned_window =
|
| Shell::Get()->screen_pinning_controller()->pinned_window();
|
| if (pinned_window)
|
| - pinned_window->GetWindowState()->Restore();
|
| + wm::GetWindowState(pinned_window)->Restore();
|
| }
|
|
|
| } // namespace accelerators
|
|
|