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

Side by Side Diff: components/undo/bookmark_undo_service.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: Build fix 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ 5 #ifndef COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_
6 #define COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ 6 #define COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 void OnWillChangeBookmarkNode(bookmarks::BookmarkModel* model, 58 void OnWillChangeBookmarkNode(bookmarks::BookmarkModel* model,
59 const bookmarks::BookmarkNode* node) override; 59 const bookmarks::BookmarkNode* node) override;
60 void OnWillReorderBookmarkNode(bookmarks::BookmarkModel* model, 60 void OnWillReorderBookmarkNode(bookmarks::BookmarkModel* model,
61 const bookmarks::BookmarkNode* node) override; 61 const bookmarks::BookmarkNode* node) override;
62 void GroupedBookmarkChangesBeginning( 62 void GroupedBookmarkChangesBeginning(
63 bookmarks::BookmarkModel* model) override; 63 bookmarks::BookmarkModel* model) override;
64 void GroupedBookmarkChangesEnded(bookmarks::BookmarkModel* model) override; 64 void GroupedBookmarkChangesEnded(bookmarks::BookmarkModel* model) override;
65 65
66 // bookmarks::BookmarkUndoDelegate: 66 // bookmarks::BookmarkUndoDelegate:
67 void SetUndoProvider(bookmarks::BookmarkUndoProvider* undo_provider) override; 67 void SetUndoProvider(bookmarks::BookmarkUndoProvider* undo_provider) override;
68 void OnBookmarkNodeRemoved(bookmarks::BookmarkModel* model, 68 void OnBookmarkNodeRemoved(
69 const bookmarks::BookmarkNode* parent, 69 bookmarks::BookmarkModel* model,
70 int index, 70 const bookmarks::BookmarkNode* parent,
71 scoped_ptr<bookmarks::BookmarkNode> node) override; 71 int index,
72 std::unique_ptr<bookmarks::BookmarkNode> node) override;
danakj 2016/04/25 18:32:58 include memory
dcheng 2016/04/25 19:55:06 I structured it this way because it's only referen
72 73
73 bookmarks::BookmarkModel* model_; 74 bookmarks::BookmarkModel* model_;
74 bookmarks::BookmarkUndoProvider* undo_provider_; 75 bookmarks::BookmarkUndoProvider* undo_provider_;
75 UndoManager undo_manager_; 76 UndoManager undo_manager_;
76 ScopedObserver<bookmarks::BookmarkModel, bookmarks::BookmarkModelObserver> 77 ScopedObserver<bookmarks::BookmarkModel, bookmarks::BookmarkModelObserver>
77 scoped_observer_; 78 scoped_observer_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(BookmarkUndoService); 80 DISALLOW_COPY_AND_ASSIGN(BookmarkUndoService);
80 }; 81 };
81 82
82 #endif // COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_ 83 #endif // COMPONENTS_UNDO_BOOKMARK_UNDO_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698