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

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

Issue 961683002: Move ManagedBookmarksTracker from policy/core/browser to bookmarks/managed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add back to policy DEPS Created 5 years, 9 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
Index: chrome/browser/bookmarks/chrome_bookmark_client.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
index 14e2f1a8aed6e74774695299c11cf4eb1f4b990e..3f5fa30a90aee090f2ff3053b3b89e49d748dfaa 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -15,6 +15,7 @@
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/managed/managed_bookmarks_tracker.h"
#include "components/favicon/core/browser/favicon_service.h"
#include "components/history/core/browser/history_service.h"
#include "components/history/core/browser/url_database.h"
@@ -29,6 +30,7 @@
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
using bookmarks::BookmarkPermanentNode;
+using bookmarks::ManagedBookmarksTracker;
namespace {
@@ -52,7 +54,7 @@ void LoadInitialContents(BookmarkPermanentNode* node,
// Load the initial contents of the |node| now, and assign it an unused ID.
int64 id = *next_node_id;
node->set_id(id);
- *next_node_id = policy::ManagedBookmarksTracker::LoadInitial(
+ *next_node_id = ManagedBookmarksTracker::LoadInitial(
node, initial_bookmarks, id + 1);
node->set_visible(!node->empty());
}
@@ -76,13 +78,13 @@ void ChromeBookmarkClient::Init(BookmarkModel* model) {
model_ = model;
model_->AddObserver(this);
- managed_bookmarks_tracker_.reset(new policy::ManagedBookmarksTracker(
+ managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
model_,
profile_->GetPrefs(),
false,
base::Bind(&ChromeBookmarkClient::GetManagedBookmarksDomain,
base::Unretained(this))));
- supervised_bookmarks_tracker_.reset(new policy::ManagedBookmarksTracker(
+ supervised_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
model_,
profile_->GetPrefs(),
true,
« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.h ('k') | chrome/browser/policy/managed_bookmarks_policy_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698