| Index: ash/wm/lock_window_state.cc
|
| diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc
|
| index 6230dd13dbd0b3eac8fde5069de3aad920950b38..7e5b4ec37331f5eb57087b25d8d1e95595bc6f87 100644
|
| --- a/ash/wm/lock_window_state.cc
|
| +++ b/ash/wm/lock_window_state.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/wm/lock_window_state.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "ash/display/display_manager.h"
|
| #include "ash/screen_util.h"
|
| #include "ash/shell.h"
|
| @@ -112,7 +114,7 @@ void LockWindowState::DetachState(wm::WindowState* window_state) {
|
| wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) {
|
| scoped_ptr<wm::WindowState::State> lock_state(new LockWindowState(window));
|
| scoped_ptr<wm::WindowState::State> old_state(
|
| - wm::GetWindowState(window)->SetStateObject(lock_state.Pass()));
|
| + wm::GetWindowState(window)->SetStateObject(std::move(lock_state)));
|
| return wm::GetWindowState(window);
|
| }
|
|
|
|
|