| 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,
|
|
|