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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.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/window_util_unittest.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/multi_window_resize_controller.h
diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
index a40197ba65503ca6fd1fda06eb2feba2515cd41c..efb0f68bce3f1159874176990f62353a6162365e 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -5,11 +5,11 @@
#ifndef ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
#define ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
+#include <memory>
#include <vector>
#include "ash/ash_export.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/timer/timer.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/geometry/rect.h"
@@ -159,10 +159,10 @@ class ASH_EXPORT MultiWindowResizeController :
// Timer used before showing.
base::OneShotTimer show_timer_;
- scoped_ptr<views::Widget> resize_widget_;
+ std::unique_ptr<views::Widget> resize_widget_;
// If non-null we're in a resize loop.
- scoped_ptr<WorkspaceWindowResizer> window_resizer_;
+ std::unique_ptr<WorkspaceWindowResizer> window_resizer_;
// Mouse coordinate passed to Show() in container's coodinates.
gfx::Point show_location_in_parent_;
@@ -173,7 +173,7 @@ class ASH_EXPORT MultiWindowResizeController :
// Used to detect whether the mouse is over the windows. While
// |resize_widget_| is non-NULL (ie the widget is showing) we ignore calls
// to Show().
- scoped_ptr<views::MouseWatcher> mouse_watcher_;
+ std::unique_ptr<views::MouseWatcher> mouse_watcher_;
DISALLOW_COPY_AND_ASSIGN(MultiWindowResizeController);
};
« no previous file with comments | « ash/wm/window_util_unittest.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698