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

Unified Diff: chrome/browser/bookmarks/bookmark_utils.cc

Issue 176563002: Revert r252832: Eliminate Bookmarks dependence to bookmark_undo_utils.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « chrome/browser/bookmarks/bookmark_utils.h ('k') | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_utils.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 184c2aa9285210ff2a81f8930e8622f6c9e2fda1..6da548b5808545b4d3d428ddc4ef4f0153fb90d2 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -15,11 +15,10 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/scoped_group_bookmark_actions.h"
#include "chrome/browser/history/query_parser.h"
#include "chrome/browser/undo/bookmark_undo_service.h"
#include "chrome/browser/undo/bookmark_undo_service_factory.h"
+#include "chrome/browser/undo/bookmark_undo_utils.h"
#include "chrome/common/pref_names.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/user_metrics.h"
@@ -150,7 +149,7 @@ void CopyToClipboard(BookmarkModel* model,
if (remove_nodes) {
#if !defined(OS_ANDROID)
- ScopedGroupBookmarkActions group_cut(model);
+ ScopedGroupBookmarkActions group_cut(model->profile());
#endif
for (size_t i = 0; i < filtered_nodes.size(); ++i) {
int index = filtered_nodes[i]->parent()->GetIndexOf(filtered_nodes[i]);
@@ -173,7 +172,7 @@ void PasteFromClipboard(BookmarkModel* model,
if (index == -1)
index = parent->child_count();
#if !defined(OS_ANDROID)
- ScopedGroupBookmarkActions group_paste(model);
+ ScopedGroupBookmarkActions group_paste(model->profile());
#endif
CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
}
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.h ('k') | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698