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

Unified Diff: components/undo/undo_manager.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « components/undo/bookmark_undo_service_test.cc ('k') | components/undo/undo_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/undo/undo_manager.h
diff --git a/components/undo/undo_manager.h b/components/undo/undo_manager.h
index ef129957088f695e162d30da33119aad39818758..3cb7fdfd0cf74efbe09c5b79ff61a340de6f4d00 100644
--- a/components/undo/undo_manager.h
+++ b/components/undo/undo_manager.h
@@ -7,8 +7,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
#include "base/strings/string16.h"
@@ -25,7 +26,7 @@ class UndoGroup {
UndoGroup();
~UndoGroup();
- void AddOperation(scoped_ptr<UndoOperation> operation);
+ void AddOperation(std::unique_ptr<UndoOperation> operation);
const std::vector<UndoOperation*>& undo_operations() {
return operations_.get();
}
@@ -67,7 +68,7 @@ class UndoManager {
base::string16 GetUndoLabel() const;
base::string16 GetRedoLabel() const;
- void AddUndoOperation(scoped_ptr<UndoOperation> operation);
+ void AddUndoOperation(std::unique_ptr<UndoOperation> operation);
// Group multiple operations into one undoable action.
void StartGroupingActions();
@@ -117,7 +118,7 @@ class UndoManager {
int group_actions_count_;
// The container that is used when actions are grouped.
- scoped_ptr<UndoGroup> pending_grouped_action_;
+ std::unique_ptr<UndoGroup> pending_grouped_action_;
// The action that is in the process of being undone.
UndoGroup* undo_in_progress_action_;
« no previous file with comments | « components/undo/bookmark_undo_service_test.cc ('k') | components/undo/undo_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698