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

Unified Diff: chrome/browser/profiles/profile_impl.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
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d6a44665a87e0d31f61dfd9ab5b4c81076a39cb7..ed645b7e33d2f630a43fce3490ba5c6d0ce81cfc 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -137,8 +137,8 @@
#endif
#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_user_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
#endif
using base::Time;
@@ -458,11 +458,11 @@ ProfileImpl::ProfileImpl(
BrowserContextDependencyManager::GetInstance()->
RegisterProfilePrefsForServices(this, pref_registry_.get());
- ManagedUserSettingsService* managed_user_settings = NULL;
+ SupervisedUserSettingsService* supervised_user_settings = NULL;
#if defined(ENABLE_MANAGED_USERS)
- managed_user_settings =
- ManagedUserSettingsServiceFactory::GetForProfile(this);
- managed_user_settings->Init(
+ supervised_user_settings =
+ SupervisedUserSettingsServiceFactory::GetForProfile(this);
+ supervised_user_settings->Init(
path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
#endif
@@ -483,7 +483,7 @@ ProfileImpl::ProfileImpl(
sequenced_task_runner,
pref_validation_delegate_.get(),
profile_policy_connector_->policy_service(),
- managed_user_settings,
+ supervised_user_settings,
new ExtensionPrefStore(
ExtensionPrefValueMapFactory::GetForBrowserContext(this), false),
pref_registry_,
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698