chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h ('k') | chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc

diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc

similarity index 75%

rename from chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc

rename to chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc

index bef54d84060cb2f38b8dae07f712725b31f7e5f2..55a8fb928b74891725ae9ff35631e742433dbcb1 100644

--- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc

+++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.cc

@@ -2,10 +2,10 @@

// 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/supervised_user_pref_mapping_service_factory.h"

+#include "chrome/browser/supervised_user/supervised_user_pref_mapping_service_factory.h"

-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"

-#include "chrome/browser/managed_mode/supervised_user_pref_mapping_service.h"

+#include "chrome/browser/supervised_user/supervised_user_pref_mapping_service.h"

+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

#include "components/user_prefs/user_prefs.h"

#include "content/public/browser/browser_context.h"

@@ -29,7 +29,7 @@ SupervisedUserPrefMappingServiceFactory::

: BrowserContextKeyedServiceFactory(

"SupervisedUserPrefMappingService",

BrowserContextDependencyManager::GetInstance()) {

- DependsOn(ManagedUserSharedSettingsServiceFactory::GetInstance());

+ DependsOn(SupervisedUserSharedSettingsServiceFactory::GetInstance());

}

SupervisedUserPrefMappingServiceFactory::

@@ -39,5 +39,6 @@ KeyedService* SupervisedUserPrefMappingServiceFactory::BuildServiceInstanceFor(

content::BrowserContext* profile) const {

return new SupervisedUserPrefMappingService(

user_prefs::UserPrefs::Get(profile),

- ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile));

+ SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(

+ profile));

}