Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Unified Diff: ash/wm/panels/panel_layout_manager.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/panels/panel_layout_manager.h ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ash/wm/panels/panel_layout_manager.h ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698