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

Unified Diff: ash/wm/workspace_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/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.h
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index f22b2eaa4ea421a1a1835e1521f366b946f86e72..c5c318c4ccf655df1530003643dc725b6b1cb5af 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -5,10 +5,11 @@
#ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
#define ASH_WM_WORKSPACE_CONTROLLER_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "ash/wm/workspace/workspace_types.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace aura {
class Window;
@@ -39,7 +40,7 @@ class ASH_EXPORT WorkspaceController {
// Add a delegate which adds a backdrop behind the top window of the default
// workspace.
void SetMaximizeBackdropDelegate(
- scoped_ptr<WorkspaceLayoutManagerDelegate> delegate);
+ std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate);
WorkspaceLayoutManager* layout_manager() { return layout_manager_; }
@@ -49,7 +50,7 @@ class ASH_EXPORT WorkspaceController {
aura::Window* viewport_;
ShelfLayoutManager* shelf_;
- scoped_ptr<WorkspaceEventHandler> event_handler_;
+ std::unique_ptr<WorkspaceEventHandler> event_handler_;
WorkspaceLayoutManager* layout_manager_;
DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698