| 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_;
|
|
|