| Index: chrome/browser/supervised_user/supervised_user_site_list.cc
|
| diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/supervised_user/supervised_user_site_list.cc
|
| similarity index 89%
|
| rename from chrome/browser/managed_mode/managed_mode_site_list.cc
|
| rename to chrome/browser/supervised_user/supervised_user_site_list.cc
|
| index e254381b14081568eba97526c12e51b1fd63a5fc..1e711b58c7c8140fda51fd207adc3f9cdd09ec34 100644
|
| --- a/chrome/browser/managed_mode/managed_mode_site_list.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_site_list.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/managed_mode/managed_mode_site_list.h"
|
| +#include "chrome/browser/supervised_user/supervised_user_site_list.h"
|
|
|
| #include "base/json/json_file_value_serializer.h"
|
| #include "base/logging.h"
|
| @@ -69,7 +69,7 @@ int GetCategoryId(const std::string& category) {
|
| // (via URL patterns or hostname hashes) and the URL in the corresponding Site
|
| // struct.
|
| void AddWhitelistEntries(const base::DictionaryValue* site_dict,
|
| - ManagedModeSiteList::Site* site) {
|
| + SupervisedUserSiteList::Site* site) {
|
| std::vector<std::string>* patterns = &site->patterns;
|
|
|
| bool found = false;
|
| @@ -125,29 +125,29 @@ void AddWhitelistEntries(const base::DictionaryValue* site_dict,
|
|
|
| } // namespace
|
|
|
| -ManagedModeSiteList::Site::Site(const base::string16& name,
|
| - int category_id)
|
| +SupervisedUserSiteList::Site::Site(const base::string16& name,
|
| + int category_id)
|
| : name(name),
|
| category_id(category_id) {}
|
|
|
| -ManagedModeSiteList::Site::~Site() {}
|
| +SupervisedUserSiteList::Site::~Site() {}
|
|
|
| -ManagedModeSiteList::ManagedModeSiteList(
|
| +SupervisedUserSiteList::SupervisedUserSiteList(
|
| const std::string& extension_id,
|
| const base::FilePath& path)
|
| : extension_id_(extension_id),
|
| path_(path) {
|
| }
|
|
|
| -ManagedModeSiteList::~ManagedModeSiteList() {
|
| +SupervisedUserSiteList::~SupervisedUserSiteList() {
|
| }
|
|
|
| -ManagedModeSiteList* ManagedModeSiteList::Clone() {
|
| - return new ManagedModeSiteList(extension_id_, path_);
|
| +SupervisedUserSiteList* SupervisedUserSiteList::Clone() {
|
| + return new SupervisedUserSiteList(extension_id_, path_);
|
| }
|
|
|
| // static
|
| -void ManagedModeSiteList::GetCategoryNames(
|
| +void SupervisedUserSiteList::GetCategoryNames(
|
| std::vector<base::string16>* categories) {
|
| // TODO(bauerb): Collect custom categories from extensions.
|
| for (size_t i = 0; i < arraysize(g_categories); ++i) {
|
| @@ -155,7 +155,7 @@ void ManagedModeSiteList::GetCategoryNames(
|
| }
|
| }
|
|
|
| -void ManagedModeSiteList::GetSites(std::vector<Site>* sites) {
|
| +void SupervisedUserSiteList::GetSites(std::vector<Site>* sites) {
|
| if (!LazyLoad())
|
| return;
|
|
|
| @@ -191,7 +191,7 @@ void ManagedModeSiteList::GetSites(std::vector<Site>* sites) {
|
| }
|
| }
|
|
|
| -bool ManagedModeSiteList::LazyLoad() {
|
| +bool SupervisedUserSiteList::LazyLoad() {
|
| if (sites_.get())
|
| return true;
|
|
|
| @@ -232,8 +232,9 @@ bool ManagedModeSiteList::LazyLoad() {
|
| return true;
|
| }
|
|
|
| -void ManagedModeSiteList::CopyThumbnailUrl(const base::DictionaryValue* source,
|
| - base::DictionaryValue* dest) {
|
| +void SupervisedUserSiteList::CopyThumbnailUrl(
|
| + const base::DictionaryValue* source,
|
| + base::DictionaryValue* dest) {
|
| if (!source->HasKey(kThumbnailKey))
|
| return;
|
|
|
|
|