diff options
| author | treib@chromium.org <treib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 15:52:09 +0000 |
|---|---|---|
| committer | treib@chromium.org <treib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 15:52:09 +0000 |
| commit | f3918a49017af1015fe4256f80b35eb6577a67b8 (patch) | |
| tree | 0256bbe700c809386e0ab51278eef1dc9b2df2ce | |
| parent | 95c4ab642a3de8bf81600fd963c64471c848e14d (diff) | |
| download | chromium_src-f3918a49017af1015fe4256f80b35eb6577a67b8.zip chromium_src-f3918a49017af1015fe4256f80b35eb6577a67b8.tar.gz chromium_src-f3918a49017af1015fe4256f80b35eb6577a67b8.tar.bz2 | |
Rename "managed (mode|user)" to "supervised user" (part 4)
Followup to https://codereview.chromium.org/335273005/, https://codereview.chromium.org/335833003/, and https://codereview.chromium.org/316863002/
This CL renames the remaining C++ stuff, except for CrOS-specific code.
Still missing:
- ChromeOS-specific code in c/b/chromeos/login/managed/ and ash/system/
- JavaScript
- Resource names
- The global ENABLE_MANAGED_USERS define
TBR=msw@chromium.org (c/b/ui)
TBR=noms@chromium.org (c/b/profiles)
TBR=atwilson@chromium.org (components/signin)
TBR=finnur@chromium.org (c/b/extensions, c/common/extensions, and extensions/common)
All the TBRs are just renames.
BUG=385113
Review URL: https://codereview.chromium.org/345563008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279414 0039d316-1c4b-4281-b951-d872f2087c98
16 files changed, 70 insertions, 66 deletions
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 2470a32..062ef79 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -17,7 +17,7 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile_manager.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/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" @@ -436,7 +436,7 @@ void InstalledLoader::LoadAllExtensions() { if (extension_action_manager->GetBrowserAction(*extension)) ++browser_action_count; - if (ManagedModeInfo::IsContentPack(extension)) + if (SupervisedUserInfo::IsContentPack(extension)) ++content_pack_count; RecordCreationFlags(extension); diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc index 7dcd1dd..e31ee23 100644 --- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc +++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc @@ -171,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, InstallFromHostedApp) { EXPECT_TRUE(extension_service->extensions()->Contains(kTestExtensionId)); } -class WebstoreStartupInstallerManagedUsersTest +class WebstoreStartupInstallerSupervisedUsersTest : public WebstoreStartupInstallerTest { public: // InProcessBrowserTest overrides: @@ -181,7 +181,7 @@ class WebstoreStartupInstallerManagedUsersTest } }; -IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerManagedUsersTest, +IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerSupervisedUsersTest, InstallProhibited) { #if defined(OS_WIN) && defined(USE_ASH) // Disable this test in Metro+Ash for now (http://crbug.com/262796). diff --git a/chrome/browser/profiles/avatar_menu.h b/chrome/browser/profiles/avatar_menu.h index c58de8d..f319a32 100644 --- a/chrome/browser/profiles/avatar_menu.h +++ b/chrome/browser/profiles/avatar_menu.h @@ -58,7 +58,7 @@ class AvatarMenu : public content::NotificationObserver { bool signin_required; // Whether or not the current profile is a supervised user - // (see ManagedUserService). + // (see SupervisedUserService). bool supervised; // The index in the menu of this profile, used by views to refer to diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 62cff90..c9fc3e1 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -202,7 +202,7 @@ class Profile : public content::BrowserContext { // profile is not incognito. virtual Profile* GetOriginalProfile() = 0; - // Returns whether the profile is supervised (see ManagedUserService). + // Returns whether the profile is supervised (see SupervisedUserService). virtual bool IsSupervised() = 0; // Returns a pointer to the TopSites (thumbnail manager) instance diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index d20661e..4b36d4b 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())); diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 821bfe6..a55248c 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -998,7 +998,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) { EXPECT_EQ(1U, infobar_service->infobar_count()); } -class ManagedModeBrowserCreatorTest : public InProcessBrowserTest { +class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest { protected: virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { InProcessBrowserTest::SetUpCommandLine(command_line); @@ -1006,8 +1006,8 @@ class ManagedModeBrowserCreatorTest : public InProcessBrowserTest { } }; -IN_PROC_BROWSER_TEST_F(ManagedModeBrowserCreatorTest, - StartupManagedModeProfile) { +IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest, + StartupSupervisedUserProfile) { StartupBrowserCreator browser_creator; // Do a simple non-process-startup browser launch. diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 4eb470f..27779e1 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -283,7 +283,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI<InstantUI>; if (url.host() == chrome::kChromeUIInvalidationsHost) return &NewWebUI<InvalidationsUI>; - if (url.host() == chrome::kChromeUIManagedUserPassphrasePageHost) + if (url.host() == chrome::kChromeUISupervisedUserPassphrasePageHost) return &NewWebUI<ConstrainedWebDialogUI>; if (url.host() == chrome::kChromeUIMemoryInternalsHost) return &NewWebUI<MemoryInternalsUI>; diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 665ec7f..dc9e02e 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -66,12 +66,12 @@ 'common/extensions/api/i18n/default_locale_handler.h', 'common/extensions/api/identity/oauth2_manifest_handler.cc', 'common/extensions/api/identity/oauth2_manifest_handler.h', - 'common/extensions/api/managed_mode_private/managed_mode_handler.cc', - 'common/extensions/api/managed_mode_private/managed_mode_handler.h', 'common/extensions/api/plugins/plugins_handler.cc', 'common/extensions/api/plugins/plugins_handler.h', 'common/extensions/api/storage/storage_schema_manifest_handler.cc', 'common/extensions/api/storage/storage_schema_manifest_handler.h', + 'common/extensions/api/supervised_user_private/supervised_user_handler.cc', + 'common/extensions/api/supervised_user_private/supervised_user_handler.h', 'common/extensions/chrome_extension_messages.h', 'common/extensions/chrome_extensions_client.cc', 'common/extensions/chrome_extensions_client.h', diff --git a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc b/chrome/common/extensions/api/supervised_user_private/supervised_user_handler.cc index 90905bb..486ed72 100644 --- a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.cc +++ b/chrome/common/extensions/api/supervised_user_private/supervised_user_handler.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#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 "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" @@ -15,40 +15,40 @@ namespace extensions { namespace keys = manifest_keys; -ManagedModeInfo::ManagedModeInfo() { +SupervisedUserInfo::SupervisedUserInfo() { } -ManagedModeInfo::~ManagedModeInfo() { +SupervisedUserInfo::~SupervisedUserInfo() { } // static -bool ManagedModeInfo::IsContentPack(const Extension* extension) { - ManagedModeInfo* info = static_cast<ManagedModeInfo*>( +bool SupervisedUserInfo::IsContentPack(const Extension* extension) { + SupervisedUserInfo* info = static_cast<SupervisedUserInfo*>( extension->GetManifestData(keys::kContentPack)); return info ? !info->site_list.empty() : false; } // static -ExtensionResource ManagedModeInfo::GetContentPackSiteList( +ExtensionResource SupervisedUserInfo::GetContentPackSiteList( const Extension* extension) { - ManagedModeInfo* info = static_cast<ManagedModeInfo*>( - extension->GetManifestData(keys::kContentPack)); - return info && !info->site_list.empty() ? - extension->GetResource(info->site_list) : - ExtensionResource(); + SupervisedUserInfo* info = static_cast<SupervisedUserInfo*>( + extension->GetManifestData(keys::kContentPack)); + return info && !info->site_list.empty() + ? extension->GetResource(info->site_list) + : ExtensionResource(); } -ManagedModeHandler::ManagedModeHandler() { +SupervisedUserHandler::SupervisedUserHandler() { } -ManagedModeHandler::~ManagedModeHandler() { +SupervisedUserHandler::~SupervisedUserHandler() { } -bool ManagedModeHandler::Parse(Extension* extension, base::string16* error) { +bool SupervisedUserHandler::Parse(Extension* extension, base::string16* error) { if (!extension->manifest()->HasKey(keys::kContentPack)) return true; - scoped_ptr<ManagedModeInfo> info(new ManagedModeInfo); + scoped_ptr<SupervisedUserInfo> info(new SupervisedUserInfo); const base::DictionaryValue* content_pack_value = NULL; if (!extension->manifest()->GetDictionary(keys::kContentPack, &content_pack_value)) { @@ -65,12 +65,12 @@ bool ManagedModeHandler::Parse(Extension* extension, base::string16* error) { return true; } -const std::vector<std::string> ManagedModeHandler::Keys() const { +const std::vector<std::string> SupervisedUserHandler::Keys() const { return SingleKey(keys::kContentPack); } -bool ManagedModeHandler::LoadSites( - ManagedModeInfo* info, +bool SupervisedUserHandler::LoadSites( + SupervisedUserInfo* info, const base::DictionaryValue* content_pack_value, base::string16* error) { if (!content_pack_value->HasKey(keys::kContentPackSites)) @@ -88,8 +88,8 @@ bool ManagedModeHandler::LoadSites( return true; } -bool ManagedModeHandler::LoadConfigurations( - ManagedModeInfo* info, +bool SupervisedUserHandler::LoadConfigurations( + SupervisedUserInfo* info, const base::DictionaryValue* content_pack_value, base::string16* error) { NOTIMPLEMENTED(); diff --git a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h b/chrome/common/extensions/api/supervised_user_private/supervised_user_handler.h index 81822c5..b355fa6 100644 --- a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h +++ b/chrome/common/extensions/api/supervised_user_private/supervised_user_handler.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#ifndef CHROME_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_ -#define CHROME_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_ +#ifndef CHROME_COMMON_EXTENSIONS_API_SUPERVISED_USER_PRIVATE_SUPERVISED_USER_HANDLER_H_ +#define CHROME_COMMON_EXTENSIONS_API_SUPERVISED_USER_PRIVATE_SUPERVISED_USER_HANDLER_H_ #include <string> @@ -16,37 +16,38 @@ namespace extensions { -struct ManagedModeInfo : public Extension::ManifestData { - ManagedModeInfo(); - virtual ~ManagedModeInfo(); +struct SupervisedUserInfo : public Extension::ManifestData { + SupervisedUserInfo(); + virtual ~SupervisedUserInfo(); static bool IsContentPack(const Extension* extension); static ExtensionResource GetContentPackSiteList(const Extension* extension); - // A file containing a list of sites for Managed Mode. + // A file containing a list of sites for a supervised user. base::FilePath site_list; }; -// Parses the "content_pack" manifest key for Managed Mode. -class ManagedModeHandler : public ManifestHandler { +// Parses the "content_pack" manifest key for a supervised user. +class SupervisedUserHandler : public ManifestHandler { public: - ManagedModeHandler(); - virtual ~ManagedModeHandler(); + SupervisedUserHandler(); + virtual ~SupervisedUserHandler(); virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE; + private: virtual const std::vector<std::string> Keys() const OVERRIDE; - bool LoadSites(ManagedModeInfo* info, + bool LoadSites(SupervisedUserInfo* info, const base::DictionaryValue* content_pack_value, base::string16* error); - bool LoadConfigurations(ManagedModeInfo* info, + bool LoadConfigurations(SupervisedUserInfo* info, const base::DictionaryValue* content_pack_value, base::string16* error); - DISALLOW_COPY_AND_ASSIGN(ManagedModeHandler); + DISALLOW_COPY_AND_ASSIGN(SupervisedUserHandler); }; } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_HANDLER_H_ +#endif // CHROME_COMMON_EXTENSIONS_API_SUPERVISED_USER_PRIVATE_SUPERVISED_USER_HANDLER_H_ diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc index cad4637..18c68a5 100644 --- a/chrome/common/extensions/chrome_manifest_handlers.cc +++ b/chrome/common/extensions/chrome_manifest_handlers.cc @@ -15,11 +15,11 @@ #if defined(OS_CHROMEOS) #include "chrome/common/extensions/api/input_ime/input_components_handler.h" #endif -#include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h" #include "chrome/common/extensions/api/spellcheck/spellcheck_handler.h" +#include "chrome/common/extensions/api/supervised_user_private/supervised_user_handler.h" #include "chrome/common/extensions/api/system_indicator/system_indicator_handler.h" #include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" @@ -58,7 +58,6 @@ void RegisterChromeManifestHandlers() { #if defined(OS_CHROMEOS) (new InputComponentsHandler)->Register(); #endif - (new ManagedModeHandler)->Register(); (new MimeTypesHandlerParser)->Register(); (new MinimumChromeVersionChecker)->Register(); (new NaClModulesHandler)->Register(); @@ -72,6 +71,7 @@ void RegisterChromeManifestHandlers() { (new SocketsManifestHandler)->Register(); (new SpellcheckHandler)->Register(); (new StorageSchemaManifestHandler)->Register(); + (new SupervisedUserHandler)->Register(); (new SystemIndicatorHandler)->Register(); (new ThemeHandler)->Register(); (new TtsEngineManifestHandler)->Register(); diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index ed97b24..5f08b92 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -48,7 +48,7 @@ const char kSupervisedUserCustodianEmail[] = "profile.managed.custodian_email"; const char kSupervisedUserCustodianName[] = "profile.managed.custodian_name"; // Stores settings that can be modified both by a supervised user and their -// manager. See ManagedUserSharedSettingsService for a description of +// manager. See SupervisedUserSharedSettingsService for a description of // the format. const char kSupervisedUserSharedSettings[] = "profile.managed.shared_settings"; diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 7f0841a..042910a 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -56,8 +56,6 @@ const char kChromeUIInspectURL[] = "chrome://inspect/"; const char kChromeUIInstantURL[] = "chrome://instant/"; const char kChromeUIInvalidationsURL[] = "chrome://invalidations/"; const char kChromeUIIPCURL[] = "chrome://ipc/"; -const char kChromeUIManagedUserPassphrasePageURL[] = - "chrome://managed-user-passphrase/"; const char kChromeUIMemoryRedirectURL[] = "chrome://memory-redirect/"; const char kChromeUIMemoryURL[] = "chrome://memory/"; const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; @@ -77,10 +75,12 @@ const char kChromeUIQuitURL[] = "chrome://quit/"; const char kChromeUIRestartURL[] = "chrome://restart/"; const char kChromeUISettingsURL[] = "chrome://settings/"; const char kChromeUISettingsFrameURL[] = "chrome://settings-frame/"; +const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/"; const char kChromeUISuggestions[] = "chrome://suggestions/"; const char kChromeUISuggestionsInternalsURL[] = "chrome://suggestions-internals/"; -const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/"; +const char kChromeUISupervisedUserPassphrasePageURL[] = + "chrome://managed-user-passphrase/"; const char kChromeUITermsURL[] = "chrome://terms/"; const char kChromeUIThemeURL[] = "chrome://theme/"; const char kChromeUIThumbnailURL[] = "chrome://thumb/"; @@ -192,7 +192,6 @@ const char kChromeUIInstantHost[] = "instant"; const char kChromeUIInvalidationsHost[] = "invalidations"; const char kChromeUIIPCHost[] = "ipc"; const char kChromeUIKillHost[] = "kill"; -const char kChromeUIManagedUserPassphrasePageHost[] = "managed-user-passphrase"; const char kChromeUIMemoryHost[] = "memory"; const char kChromeUIMemoryInternalsHost[] = "memory-internals"; const char kChromeUIMemoryRedirectHost[] = "memory-redirect"; @@ -221,10 +220,12 @@ const char kChromeUISettingsHost[] = "settings"; const char kChromeUISettingsFrameHost[] = "settings-frame"; const char kChromeUIShorthangHost[] = "shorthang"; const char kChromeUISignInInternalsHost[] = "signin-internals"; -const char kChromeUISuggestionsHost[] = "suggestions"; -const char kChromeUISuggestionsInternalsHost[] = "suggestions-internals"; const char kChromeUISSLClientCertificateSelectorHost[] = "select-cert"; const char kChromeUIStatsHost[] = "stats"; +const char kChromeUISuggestionsHost[] = "suggestions"; +const char kChromeUISuggestionsInternalsHost[] = "suggestions-internals"; +const char kChromeUISupervisedUserPassphrasePageHost[] = + "managed-user-passphrase"; const char kChromeUISyncHost[] = "sync"; const char kChromeUISyncFileSystemInternalsHost[] = "syncfs-internals"; const char kChromeUISyncInternalsHost[] = "sync-internals"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index c330355..9373e79 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -52,7 +52,6 @@ extern const char kChromeUIInspectURL[]; extern const char kChromeUIInstantURL[]; extern const char kChromeUIInvalidationsURL[]; extern const char kChromeUIIPCURL[]; -extern const char kChromeUIManagedUserPassphrasePageURL[]; extern const char kChromeUIMemoryRedirectURL[]; extern const char kChromeUIMemoryURL[]; extern const char kChromeUIMetroFlowURL[]; @@ -75,6 +74,7 @@ extern const char kChromeUISettingsURL[]; extern const char kChromeUISettingsFrameURL[]; extern const char kChromeUISuggestions[]; extern const char kChromeUISuggestionsInternalsURL[]; +extern const char kChromeUISupervisedUserPassphrasePageURL[]; extern const char kChromeUISSLClientCertificateSelectorURL[]; extern const char kChromeUITermsURL[]; extern const char kChromeUIThemeURL[]; @@ -184,7 +184,6 @@ extern const char kChromeUIInstantHost[]; extern const char kChromeUIInvalidationsHost[]; extern const char kChromeUIIPCHost[]; extern const char kChromeUIKillHost[]; -extern const char kChromeUIManagedUserPassphrasePageHost[]; extern const char kChromeUIMemoryHost[]; extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUIMemoryRedirectHost[]; @@ -216,6 +215,7 @@ extern const char kChromeUISuggestionsHost[]; extern const char kChromeUISuggestionsInternalsHost[]; extern const char kChromeUISSLClientCertificateSelectorHost[]; extern const char kChromeUIStatsHost[]; +extern const char kChromeUISupervisedUserPassphrasePageHost[]; extern const char kChromeUISyncHost[]; extern const char kChromeUISyncFileSystemInternalsHost[]; extern const char kChromeUISyncInternalsHost[]; diff --git a/components/signin/core/browser/profile_oauth2_token_service.h b/components/signin/core/browser/profile_oauth2_token_service.h index ed37306..0878184 100644 --- a/components/signin/core/browser/profile_oauth2_token_service.h +++ b/components/signin/core/browser/profile_oauth2_token_service.h @@ -55,8 +55,8 @@ class ProfileOAuth2TokenService : public OAuth2TokenService, // profile, otherwise startup will cause unneeded work on the IO thread. The // primary account is specified with the |primary_account_id| argument and // should not be empty. For a regular profile, the primary account id comes - // from SigninManager. For a managed account, the id comes from - // ManagedUserService. + // from SigninManager. For a supervised user, the id comes from + // SupervisedUserService. virtual void LoadCredentials(const std::string& primary_account_id); // Updates a |refresh_token| for an |account_id|. Credentials are persisted, diff --git a/extensions/common/permissions/permission_message.h b/extensions/common/permissions/permission_message.h index 750fc2d..5440387 100644 --- a/extensions/common/permissions/permission_message.h +++ b/extensions/common/permissions/permission_message.h @@ -42,7 +42,7 @@ class PermissionMessage { kTtsEngine, kContentSettings, kPrivacy, - kManagedMode, + kSupervisedUser, kInput, kAudioCapture, kVideoCapture, |