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

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

Issue 305973004: BookmarkClient can add extra nodes to BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 b57fb06f3c37ae0563662a19d708b6557b4a880a..c84fc43625b969cd2942d3711572f60d48866d08 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -12,12 +12,15 @@
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/history/url_database.h"
+#include "chrome/browser/policy/profile_policy_connector.h"
+#include "chrome/browser/policy/profile_policy_connector_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/user_metrics.h"
+#include "policy/policy_constants.h"
namespace {
@@ -106,7 +109,10 @@ void ChromeBookmarkClient::RecordAction(const base::UserMetricsAction& action) {
bool ChromeBookmarkClient::IsPermanentNodeVisible(int node_type) {
DCHECK(node_type == BookmarkNode::BOOKMARK_BAR ||
node_type == BookmarkNode::OTHER_NODE ||
- node_type == BookmarkNode::MOBILE);
+ node_type == BookmarkNode::MOBILE ||
+ node_type == BookmarkNode::MANAGED);
+ if (node_type == BookmarkNode::MANAGED)
+ return false;
#if !defined(OS_IOS)
return node_type != BookmarkNode::MOBILE;
#else
@@ -114,6 +120,14 @@ bool ChromeBookmarkClient::IsPermanentNodeVisible(int node_type) {
#endif
}
+std::string ChromeBookmarkClient::GetManagedBookmarksDomain() {
+ policy::ProfilePolicyConnector* connector =
+ policy::ProfilePolicyConnectorFactory::GetForProfile(profile_);
+ if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))
+ return connector->GetManagementDomain();
+ return std::string();
+}
+
void ChromeBookmarkClient::Observe(
int type,
const content::NotificationSource& source,

Powered by Google App Engine
This is Rietveld 408576698