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

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_state.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
Index: ash/wm/maximize_mode/maximize_mode_window_state.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
index 3691dcaae82eff94c9787602a2dfdd04de968d6a..a543ddd618a1759b801348ff6dbc1126541b0e16 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -98,7 +98,7 @@ MaximizeModeWindowState::MaximizeModeWindowState(
current_state_type_(wm::GetWindowState(window)->GetStateType()),
defer_bounds_updates_(false) {
old_state_.reset(wm::GetWindowState(window)
- ->SetStateObject(scoped_ptr<State>(this))
+ ->SetStateObject(std::unique_ptr<State>(this))
.release());
}
@@ -108,7 +108,7 @@ MaximizeModeWindowState::~MaximizeModeWindowState() {
void MaximizeModeWindowState::LeaveMaximizeMode(wm::WindowState* window_state) {
// Note: When we return we will destroy ourselves with the |our_reference|.
- scoped_ptr<wm::WindowState::State> our_reference =
+ std::unique_ptr<wm::WindowState::State> our_reference =
window_state->SetStateObject(std::move(old_state_));
}

Powered by Google App Engine
This is Rietveld 408576698