Skip to content

GitLab

T
tangled
Commit a9ea2fbe authored by treib's avatar treib Committed by Commit bot
Browse files
Options

Move ManagedBookmarksTracker from policy/core/browser to (new) bookmarks/managed. 

After https://codereview.chromium.org/769153007, it handles more than policy.

BUG=443606

Review URL: https://codereview.chromium.org/961683002

Cr-Commit-Position: refs/heads/master@{#321539}
parent 26fbaa28
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 37 deletions
chrome/browser/BUILD.gn
View file @ a9ea2fbe
...@@ -82,6 +82,7 @@ static_library("browser") { ...@@ -82,6 +82,7 @@ static_library("browser") {
"//chrome/common/net", "//chrome/common/net",
"//components/autofill/core/browser", "//components/autofill/core/browser",
"//components/bookmarks/browser", "//components/bookmarks/browser",
"//components/bookmarks/managed",
"//components/captive_portal", "//components/captive_portal",
"//components/cloud_devices/common", "//components/cloud_devices/common",
"//components/component_updater", "//components/component_updater",
......
chrome/browser/DEPS
View file @ a9ea2fbe
...@@ -20,6 +20,7 @@ include_rules = [ ...@@ -20,6 +20,7 @@ include_rules = [
"+components/autofill/core/common", "+components/autofill/core/common",
"+components/bookmarks/browser", "+components/bookmarks/browser",
"+components/bookmarks/common", "+components/bookmarks/common",
"+components/bookmarks/managed",
"+components/bookmarks/test", "+components/bookmarks/test",
"+components/browser_watcher", "+components/browser_watcher",
"+components/cdm/browser", "+components/cdm/browser",
......
chrome/browser/bookmarks/chrome_bookmark_client.cc
View file @ a9ea2fbe
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_node.h" #include "components/bookmarks/browser/bookmark_node.h"
#include "components/bookmarks/browser/bookmark_utils.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/favicon/core/browser/favicon_service.h"
#include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_service.h"
#include "components/history/core/browser/url_database.h" #include "components/history/core/browser/url_database.h"
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
using bookmarks::BookmarkModel; using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode; using bookmarks::BookmarkNode;
using bookmarks::BookmarkPermanentNode; using bookmarks::BookmarkPermanentNode;
using bookmarks::ManagedBookmarksTracker;
namespace { namespace {
...@@ -52,7 +54,7 @@ void LoadInitialContents(BookmarkPermanentNode* node, ...@@ -52,7 +54,7 @@ void LoadInitialContents(BookmarkPermanentNode* node,
// Load the initial contents of the |node| now, and assign it an unused ID. // Load the initial contents of the |node| now, and assign it an unused ID.
int64 id = *next_node_id; int64 id = *next_node_id;
node->set_id(id); node->set_id(id);
*next_node_id = policy::ManagedBookmarksTracker::LoadInitial( *next_node_id = ManagedBookmarksTracker::LoadInitial(
node, initial_bookmarks, id + 1); node, initial_bookmarks, id + 1);
node->set_visible(!node->empty()); node->set_visible(!node->empty());
} }
...@@ -76,13 +78,13 @@ void ChromeBookmarkClient::Init(BookmarkModel* model) { ...@@ -76,13 +78,13 @@ void ChromeBookmarkClient::Init(BookmarkModel* model) {
model_ = model; model_ = model;
model_->AddObserver(this); model_->AddObserver(this);
managed_bookmarks_tracker_.reset(new policy::ManagedBookmarksTracker( managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
model_, model_,
profile_->GetPrefs(), profile_->GetPrefs(),
false, false,
base::Bind(&ChromeBookmarkClient::GetManagedBookmarksDomain, base::Bind(&ChromeBookmarkClient::GetManagedBookmarksDomain,
base::Unretained(this)))); base::Unretained(this))));
supervised_bookmarks_tracker_.reset(new policy::ManagedBookmarksTracker( supervised_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
model_, model_,
profile_->GetPrefs(), profile_->GetPrefs(),
true, true,
......
chrome/browser/bookmarks/chrome_bookmark_client.h
View file @ a9ea2fbe
...@@ -13,14 +13,20 @@ ...@@ -13,14 +13,20 @@
#include "base/macros.h" #include "base/macros.h"
#include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "components/bookmarks/browser/bookmark_client.h" #include "components/bookmarks/browser/bookmark_client.h"
#include "components/policy/core/browser/managed_bookmarks_tracker.h"
class GURL; class GURL;
class HistoryServiceFactory; class HistoryServiceFactory;
class Profile; class Profile;
namespace base {
class ListValue;
}
namespace bookmarks { namespace bookmarks {
class BookmarkModel; class BookmarkModel;
class BookmarkNode;
class BookmarkPermanentNode;
class ManagedBookmarksTracker;
} }
namespace history { namespace history {
...@@ -107,12 +113,12 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient, ...@@ -107,12 +113,12 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
bookmarks::BookmarkModel* model_; bookmarks::BookmarkModel* model_;
// Managed bookmarks are defined by an enterprise policy. // Managed bookmarks are defined by an enterprise policy.
scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_; scoped_ptr<bookmarks::ManagedBookmarksTracker> managed_bookmarks_tracker_;
// The top-level managed bookmarks folder. // The top-level managed bookmarks folder.
bookmarks::BookmarkPermanentNode* managed_node_; bookmarks::BookmarkPermanentNode* managed_node_;
// Supervised bookmarks are defined by the custodian of a supervised user. // Supervised bookmarks are defined by the custodian of a supervised user.
scoped_ptr<policy::ManagedBookmarksTracker> supervised_bookmarks_tracker_; scoped_ptr<bookmarks::ManagedBookmarksTracker> supervised_bookmarks_tracker_;
// The top-level supervised bookmarks folder. // The top-level supervised bookmarks folder.
bookmarks::BookmarkPermanentNode* supervised_node_; bookmarks::BookmarkPermanentNode* supervised_node_;
......
chrome/browser/policy/managed_bookmarks_policy_handler.cc
View file @ a9ea2fbe
...@@ -7,13 +7,15 @@ ...@@ -7,13 +7,15 @@
#include "base/prefs/pref_value_map.h" #include "base/prefs/pref_value_map.h"
#include "base/values.h" #include "base/values.h"
#include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/policy/core/browser/managed_bookmarks_tracker.h" #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
#include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/browser/policy_error_map.h"
#include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_map.h"
#include "components/url_fixer/url_fixer.h" #include "components/url_fixer/url_fixer.h"
#include "policy/policy_constants.h" #include "policy/policy_constants.h"
#include "url/gurl.h" #include "url/gurl.h"
using bookmarks::ManagedBookmarksTracker;
namespace policy { namespace policy {
ManagedBookmarksPolicyHandler::ManagedBookmarksPolicyHandler( ManagedBookmarksPolicyHandler::ManagedBookmarksPolicyHandler(
......
chrome/chrome_browser.gypi
View file @ a9ea2fbe
...@@ -2910,6 +2910,7 @@ ...@@ -2910,6 +2910,7 @@
'probe_message_proto', 'probe_message_proto',
'../components/components.gyp:autofill_core_browser', '../components/components.gyp:autofill_core_browser',
'../components/components.gyp:bookmarks_browser', '../components/components.gyp:bookmarks_browser',
'../components/components.gyp:bookmarks_managed',
'../components/components.gyp:captive_portal', '../components/components.gyp:captive_portal',
'../components/components.gyp:cloud_devices_common', '../components/components.gyp:cloud_devices_common',
'../components/components.gyp:component_metrics_proto', '../components/components.gyp:component_metrics_proto',
......
components/BUILD.gn
View file @ a9ea2fbe
...@@ -20,6 +20,7 @@ group("all_components") { ...@@ -20,6 +20,7 @@ group("all_components") {
"//components/autofill/content/renderer", "//components/autofill/content/renderer",
"//components/bookmarks/browser", "//components/bookmarks/browser",
"//components/bookmarks/common", "//components/bookmarks/common",
"//components/bookmarks/managed",
"//components/bookmarks/test", "//components/bookmarks/test",
"//components/captive_portal", "//components/captive_portal",
"//components/cdm/browser", "//components/cdm/browser",
...@@ -237,6 +238,7 @@ test("components_unittests") { ...@@ -237,6 +238,7 @@ test("components_unittests") {
"//components/autofill/core/browser:unit_tests", "//components/autofill/core/browser:unit_tests",
"//components/autofill/core/common:unit_tests", "//components/autofill/core/common:unit_tests",
"//components/bookmarks/browser:unit_tests", "//components/bookmarks/browser:unit_tests",
"//components/bookmarks/managed:unit_tests",
"//components/captive_portal:unit_tests", "//components/captive_portal:unit_tests",
"//components/cloud_devices/common:unit_tests", "//components/cloud_devices/common:unit_tests",
"//components/content_settings/core/browser:unit_tests", "//components/content_settings/core/browser:unit_tests",
......
components/bookmarks.gypi
View file @ a9ea2fbe
...@@ -95,6 +95,22 @@ ...@@ -95,6 +95,22 @@
'bookmarks/common/bookmark_pref_names.h', 'bookmarks/common/bookmark_pref_names.h',
], ],
}, },
{
# GN version: //components/bookmarks/managed
'target_name': 'bookmarks_managed',
'type': 'static_library',
'include_dirs': [
'..',
],
'dependencies': [
'bookmarks_browser',
'components_strings.gyp:components_strings',
],
'sources': [
'bookmarks/managed/managed_bookmarks_tracker.cc',
'bookmarks/managed/managed_bookmarks_tracker.h',
],
},
{ {
# GN version: //components/bookmarks/test # GN version: //components/bookmarks/test
'target_name': 'bookmarks_test_support', 'target_name': 'bookmarks_test_support',
......
components/bookmarks/managed/BUILD.gn 0 → 100644
View file @ a9ea2fbe
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
source_set("managed") {
sources = [
"managed_bookmarks_tracker.cc",
"managed_bookmarks_tracker.h",
]
deps = [
"//components/bookmarks/browser",
"//components/strings",
]
}
source_set("unit_tests") {
testonly = true
sources = [
"managed_bookmarks_tracker_unittest.cc",
]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
deps = [
":managed",
"//components/bookmarks/test",
"//components/strings",
"//testing/gmock",
"//testing/gtest",
]
}
components/policy/core/browser/managed_bookmarks_tracker.cc → components/bookmarks/managed/managed_bookmarks_tracker.cc
View file @ a9ea2fbe
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/policy/core/browser/managed_bookmarks_tracker.h" #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
#include <string> #include <string>
...@@ -20,11 +20,7 @@ ...@@ -20,11 +20,7 @@
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h" #include "url/gurl.h"
using bookmarks::BookmarkModel; namespace bookmarks {
using bookmarks::BookmarkNode;
using bookmarks::BookmarkPermanentNode;
namespace policy {
const char ManagedBookmarksTracker::kName[] = "name"; const char ManagedBookmarksTracker::kName[] = "name";
const char ManagedBookmarksTracker::kUrl[] = "url"; const char ManagedBookmarksTracker::kUrl[] = "url";
...@@ -90,8 +86,8 @@ void ManagedBookmarksTracker::Init(BookmarkPermanentNode* managed_node) { ...@@ -90,8 +86,8 @@ void ManagedBookmarksTracker::Init(BookmarkPermanentNode* managed_node) {
// static // static
const char* ManagedBookmarksTracker::GetPrefName(bool is_supervised) { const char* ManagedBookmarksTracker::GetPrefName(bool is_supervised) {
return is_supervised ? bookmarks::prefs::kSupervisedBookmarks return is_supervised ? prefs::kSupervisedBookmarks
: bookmarks::prefs::kManagedBookmarks; : prefs::kManagedBookmarks;
} }
const char* ManagedBookmarksTracker::GetPrefName() const { const char* ManagedBookmarksTracker::GetPrefName() const {
......
components/policy/core/browser/managed_bookmarks_tracker.h → components/bookmarks/managed/managed_bookmarks_tracker.h
View file @ a9ea2fbe
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef COMPONENTS_POLICY_CORE_BROWSER_MANAGED_BOOKMARKS_TRACKER_H_ #ifndef COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARKS_TRACKER_H_
#define COMPONENTS_POLICY_CORE_BROWSER_MANAGED_BOOKMARKS_TRACKER_H_ #define COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARKS_TRACKER_H_
#include "base/callback_forward.h" #include "base/callback_forward.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_change_registrar.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "components/policy/policy_export.h"
class GURL; class GURL;
class PrefService; class PrefService;
...@@ -19,18 +18,16 @@ class ListValue; ...@@ -19,18 +18,16 @@ class ListValue;
} }
namespace bookmarks { namespace bookmarks {
class BookmarkModel; class BookmarkModel;
class BookmarkNode; class BookmarkNode;
class BookmarkPermanentNode; class BookmarkPermanentNode;
}
namespace policy {
// Tracks either the Managed Bookmarks pref (set by policy) or the Supervised // Tracks either the Managed Bookmarks pref (set by policy) or the Supervised
// Bookmarks pref (set for a supervised user by their custodian) and makes the // Bookmarks pref (set for a supervised user by their custodian) and makes the
// managed_node()/supervised_node() in the BookmarkModel follow the // managed_node()/supervised_node() in the BookmarkModel follow the
// policy/custodian-defined bookmark tree. // policy/custodian-defined bookmark tree.
class POLICY_EXPORT ManagedBookmarksTracker { class ManagedBookmarksTracker {
public: public:
typedef base::Callback<std::string()> GetManagementDomainCallback; typedef base::Callback<std::string()> GetManagementDomainCallback;
...@@ -91,7 +88,7 @@ class POLICY_EXPORT ManagedBookmarksTracker { ...@@ -91,7 +88,7 @@ class POLICY_EXPORT ManagedBookmarksTracker {
DISALLOW_COPY_AND_ASSIGN(ManagedBookmarksTracker); DISALLOW_COPY_AND_ASSIGN(ManagedBookmarksTracker);
}; };
} // namespace policy } // namespace bookmarks
#endif // COMPONENTS_POLICY_CORE_BROWSER_MANAGED_BOOKMARKS_TRACKER_H_ #endif // COMPONENTS_BOOKMARKS_MANAGED_MANAGED_BOOKMARKS_TRACKER_H_
components/policy/core/browser/managed_bookmarks_tracker_unittest.cc → components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
View file @ a9ea2fbe
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/policy/core/browser/managed_bookmarks_tracker.h" #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
...@@ -24,13 +24,10 @@ ...@@ -24,13 +24,10 @@
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h" #include "url/gurl.h"
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
using bookmarks::BookmarkPermanentNode;
using testing::Mock; using testing::Mock;
using testing::_; using testing::_;
namespace policy { namespace bookmarks {
class ManagedBookmarksTrackerTest : public testing::Test { class ManagedBookmarksTrackerTest : public testing::Test {
public: public:
...@@ -52,7 +49,7 @@ class ManagedBookmarksTrackerTest : public testing::Test { ...@@ -52,7 +49,7 @@ class ManagedBookmarksTrackerTest : public testing::Test {
void CreateModel(bool is_supervised) { void CreateModel(bool is_supervised) {
// Simulate the creation of the managed node by the BookmarkClient. // Simulate the creation of the managed node by the BookmarkClient.
BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100); BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100);
policy::ManagedBookmarksTracker::LoadInitial( ManagedBookmarksTracker::LoadInitial(
managed_node, managed_node,
prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)), prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)),
101); 101);
...@@ -344,4 +341,4 @@ TEST_F(ManagedBookmarksTrackerTest, RemoveAllUserBookmarksDoesntRemoveManaged) { ...@@ -344,4 +341,4 @@ TEST_F(ManagedBookmarksTrackerTest, RemoveAllUserBookmarksDoesntRemoveManaged) {
Mock::VerifyAndClearExpectations(&observer_); Mock::VerifyAndClearExpectations(&observer_);
} }
} // namespace policy } // namespace bookmarks
components/components_tests.gyp
View file @ a9ea2fbe
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
'bookmarks/browser/bookmark_index_unittest.cc', 'bookmarks/browser/bookmark_index_unittest.cc',
'bookmarks/browser/bookmark_model_unittest.cc', 'bookmarks/browser/bookmark_model_unittest.cc',
'bookmarks/browser/bookmark_utils_unittest.cc', 'bookmarks/browser/bookmark_utils_unittest.cc',
'bookmarks/managed/managed_bookmarks_tracker_unittest.cc',
], ],
'browser_watcher_unittest_sources': [ 'browser_watcher_unittest_sources': [
'browser_watcher/endsession_watcher_window_win_unittest.cc', 'browser_watcher/endsession_watcher_window_win_unittest.cc',
...@@ -329,7 +330,6 @@ ...@@ -329,7 +330,6 @@
'policy/core/browser/browser_policy_connector_unittest.cc', 'policy/core/browser/browser_policy_connector_unittest.cc',
'policy/core/browser/configuration_policy_handler_unittest.cc', 'policy/core/browser/configuration_policy_handler_unittest.cc',
'policy/core/browser/configuration_policy_pref_store_unittest.cc', 'policy/core/browser/configuration_policy_pref_store_unittest.cc',
'policy/core/browser/managed_bookmarks_tracker_unittest.cc',
'policy/core/browser/url_blacklist_policy_handler_unittest.cc', 'policy/core/browser/url_blacklist_policy_handler_unittest.cc',
'policy/core/common/async_policy_provider_unittest.cc', 'policy/core/common/async_policy_provider_unittest.cc',
'policy/core/common/cloud/cloud_policy_client_unittest.cc', 'policy/core/common/cloud/cloud_policy_client_unittest.cc',
...@@ -658,6 +658,7 @@ ...@@ -658,6 +658,7 @@
'components.gyp:autofill_core_common', 'components.gyp:autofill_core_common',
'components.gyp:autofill_core_test_support', 'components.gyp:autofill_core_test_support',
'components.gyp:bookmarks_browser', 'components.gyp:bookmarks_browser',
'components.gyp:bookmarks_managed',
'components.gyp:bookmarks_test_support', 'components.gyp:bookmarks_test_support',
'components.gyp:captive_portal_test_support', 'components.gyp:captive_portal_test_support',
'components.gyp:cloud_devices_common', 'components.gyp:cloud_devices_common',
......
components/policy/core/browser/BUILD.gn
View file @ a9ea2fbe
...@@ -20,7 +20,7 @@ source_set("browser") { ...@@ -20,7 +20,7 @@ source_set("browser") {
"//base", "//base",
"//base:prefs", "//base:prefs",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//components/bookmarks/browser", "//components/bookmarks/managed",
"//components/keyed_service/core", "//components/keyed_service/core",
"//components/pref_registry", "//components/pref_registry",
"//components/strings", "//components/strings",
...@@ -45,8 +45,6 @@ source_set("browser") { ...@@ -45,8 +45,6 @@ source_set("browser") {
"configuration_policy_handler_list.h", "configuration_policy_handler_list.h",
"configuration_policy_pref_store.cc", "configuration_policy_pref_store.cc",
"configuration_policy_pref_store.h", "configuration_policy_pref_store.h",
"managed_bookmarks_tracker.cc",
"managed_bookmarks_tracker.h",
"policy_error_map.cc", "policy_error_map.cc",
"policy_error_map.h", "policy_error_map.h",
"url_blacklist_policy_handler.cc", "url_blacklist_policy_handler.cc",
......
components/policy/policy_browser.gypi
View file @ a9ea2fbe
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
'../ui/base/ui_base.gyp:ui_base', '../ui/base/ui_base.gyp:ui_base',
'../url/url.gyp:url_lib', '../url/url.gyp:url_lib',
'bookmarks_browser', 'bookmarks_browser',
'bookmarks_managed',
'components_strings.gyp:components_strings', 'components_strings.gyp:components_strings',
'keyed_service_core', 'keyed_service_core',
'pref_registry', 'pref_registry',
...@@ -55,8 +56,6 @@ ...@@ -55,8 +56,6 @@
'core/browser/configuration_policy_handler_list.h', 'core/browser/configuration_policy_handler_list.h',
'core/browser/configuration_policy_pref_store.cc', 'core/browser/configuration_policy_pref_store.cc',
'core/browser/configuration_policy_pref_store.h', 'core/browser/configuration_policy_pref_store.h',
'core/browser/managed_bookmarks_tracker.cc',
'core/browser/managed_bookmarks_tracker.h',
'core/browser/policy_error_map.cc', 'core/browser/policy_error_map.cc',
'core/browser/policy_error_map.h', 'core/browser/policy_error_map.h',
'core/browser/url_blacklist_policy_handler.cc', 'core/browser/url_blacklist_policy_handler.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment