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

Unified Diff: ui/wm/core/wm_state.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/wm/core/window_util_unittest.cc ('k') | ui/wm/public/scoped_drag_drop_disabler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/wm_state.h
diff --git a/ui/wm/core/wm_state.h b/ui/wm/core/wm_state.h
index 217434ffaf482b27f35e57c3f7fde86ed9b9b298..620315c2603bdb9d54c75a019580504aa65187d2 100644
--- a/ui/wm/core/wm_state.h
+++ b/ui/wm/core/wm_state.h
@@ -5,8 +5,9 @@
#ifndef UI_WM_CORE_WM_STATE_H_
#define UI_WM_CORE_WM_STATE_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/wm/wm_export.h"
namespace wm {
@@ -22,8 +23,8 @@ class WM_EXPORT WMState {
// WindowStackingClient:
private:
- scoped_ptr<TransientWindowStackingClient> window_stacking_client_;
- scoped_ptr<TransientWindowController> transient_window_client_;
+ std::unique_ptr<TransientWindowStackingClient> window_stacking_client_;
+ std::unique_ptr<TransientWindowController> transient_window_client_;
DISALLOW_COPY_AND_ASSIGN(WMState);
};
« no previous file with comments | « ui/wm/core/window_util_unittest.cc ('k') | ui/wm/public/scoped_drag_drop_disabler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698