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

Unified Diff: ash/wm/workspace/workspace_window_resizer.h

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/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer.h
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h
index 8ee77f77e383081513bc6bfbe05299db6d9aaa2c..62b20bf41709d4b86077eeb71aada18c8ddad9d2 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/ash/wm/workspace/workspace_window_resizer.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <vector>
#include "ash/wm/window_resizer.h"
#include "ash/wm/workspace/magnetism_matcher.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/window_tracker.h"
@@ -186,11 +186,11 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
// Gives a previews of where the the window will end up. Only used if there
// is a grid and the caption is being dragged.
- scoped_ptr<PhantomWindowController> snap_phantom_window_controller_;
+ std::unique_ptr<PhantomWindowController> snap_phantom_window_controller_;
// Used to determine whether the window should be snapped or docked when
// the user drags a window to the edge of the screen.
- scoped_ptr<TwoStepEdgeCycler> edge_cycler_;
+ std::unique_ptr<TwoStepEdgeCycler> edge_cycler_;
// The edge to which the window should be snapped to at the end of the drag.
SnapType snap_type_;
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698