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

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

Issue 345563008: Rename "managed (mode|user)" to "supervised user" (part 4) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/profiles/profile.h ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/supervised_user/supervised_user_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index d20661e188a24eec667de6de45cfccf137d5a9db..4b36d4bbcd9ba90a6381e10aab0a34985b06981c 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -35,7 +35,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h"
+#include "chrome/common/extensions/api/supervised_user_private/supervised_user_handler.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ -342,7 +342,8 @@ void SupervisedUserService::OnStateChanged() {
void SupervisedUserService::OnExtensionLoaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension) {
- if (!extensions::ManagedModeInfo::GetContentPackSiteList(extension).empty()) {
+ if (!extensions::SupervisedUserInfo::GetContentPackSiteList(extension)
+ .empty()) {
UpdateSiteLists();
}
}
@@ -350,7 +351,8 @@ void SupervisedUserService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UnloadedExtensionInfo::Reason reason) {
- if (!extensions::ManagedModeInfo::GetContentPackSiteList(extension).empty()) {
+ if (!extensions::SupervisedUserInfo::GetContentPackSiteList(extension)
+ .empty()) {
UpdateSiteLists();
}
}
@@ -402,7 +404,7 @@ SupervisedUserService::GetActiveSiteLists() {
continue;
extensions::ExtensionResource site_list =
- extensions::ManagedModeInfo::GetContentPackSiteList(extension);
+ extensions::SupervisedUserInfo::GetContentPackSiteList(extension);
if (!site_list.empty()) {
site_lists.push_back(new SupervisedUserSiteList(extension->id(),
site_list.GetFilePath()));
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698