| Index: components/undo/undo_manager.h
|
| diff --git a/components/undo/undo_manager.h b/components/undo/undo_manager.h
|
| index 3cb7fdfd0cf74efbe09c5b79ff61a340de6f4d00..24c8971b6724c785f2c66d3fe6bf6074798eb4f3 100644
|
| --- a/components/undo/undo_manager.h
|
| +++ b/components/undo/undo_manager.h
|
| @@ -8,9 +8,9 @@
|
| #include <stddef.h>
|
|
|
| #include <memory>
|
| +#include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "base/strings/string16.h"
|
|
|
| @@ -27,8 +27,8 @@ class UndoGroup {
|
| ~UndoGroup();
|
|
|
| void AddOperation(std::unique_ptr<UndoOperation> operation);
|
| - const std::vector<UndoOperation*>& undo_operations() {
|
| - return operations_.get();
|
| + const std::vector<std::unique_ptr<UndoOperation>>& undo_operations() {
|
| + return operations_;
|
| }
|
| void Undo();
|
|
|
| @@ -40,7 +40,7 @@ class UndoGroup {
|
| void set_redo_label_id(int label_id) { redo_label_id_ = label_id; }
|
|
|
| private:
|
| - ScopedVector<UndoOperation> operations_;
|
| + std::vector<std::unique_ptr<UndoOperation>> operations_;
|
|
|
| // The resource string id describing the undo and redo action.
|
| int undo_label_id_;
|
| @@ -94,7 +94,7 @@ class UndoManager {
|
|
|
| private:
|
| void Undo(bool* performing_indicator,
|
| - ScopedVector<UndoGroup>* active_undo_group);
|
| + std::vector<std::unique_ptr<UndoGroup>>* active_undo_group);
|
| bool is_user_action() const { return !performing_undo_ && !performing_redo_; }
|
|
|
| // Notifies the observers that the undo manager's state has changed.
|
| @@ -105,11 +105,11 @@ class UndoManager {
|
|
|
| // Returns the undo or redo UndoGroup container that should store the next
|
| // change taking into account if an undo or redo is being executed.
|
| - ScopedVector<UndoGroup>* GetActiveUndoGroup();
|
| + std::vector<std::unique_ptr<UndoGroup>>* GetActiveUndoGroup();
|
|
|
| // Containers of user actions ready for an undo or redo treated as a stack.
|
| - ScopedVector<UndoGroup> undo_actions_;
|
| - ScopedVector<UndoGroup> redo_actions_;
|
| + std::vector<std::unique_ptr<UndoGroup>> undo_actions_;
|
| + std::vector<std::unique_ptr<UndoGroup>> redo_actions_;
|
|
|
| // The observers to notify when internal state changes.
|
| base::ObserverList<UndoManagerObserver> observers_;
|
|
|