Index: ash/wm/panels/panel_layout_manager.cc |
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc |
index 24da733897d373b87608f54425dc33c51e61514f..69c02e7b6e967bb6374787bad69d953a44189bfd 100644 |
--- a/ash/wm/panels/panel_layout_manager.cc |
+++ b/ash/wm/panels/panel_layout_manager.cc |
@@ -534,7 +534,7 @@ void PanelLayoutManager::WillChangeVisibilityState( |
bool shelf_hidden = new_state == ash::SHELF_HIDDEN; |
if (!shelf_hidden) { |
if (restore_windows_on_shelf_visible_) { |
- scoped_ptr<aura::WindowTracker> restore_windows( |
+ std::unique_ptr<aura::WindowTracker> restore_windows( |
std::move(restore_windows_on_shelf_visible_)); |
for (aura::Window::Windows::const_iterator iter = |
restore_windows->windows().begin(); |
@@ -547,7 +547,8 @@ void PanelLayoutManager::WillChangeVisibilityState( |
if (restore_windows_on_shelf_visible_) |
return; |
- scoped_ptr<aura::WindowTracker> minimized_windows(new aura::WindowTracker); |
+ std::unique_ptr<aura::WindowTracker> minimized_windows( |
+ new aura::WindowTracker); |
for (PanelList::iterator iter = panel_windows_.begin(); |
iter != panel_windows_.end();) { |
aura::Window* window = iter->window; |