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

Unified Diff: chrome/browser/extensions/extension_system.cc

Issue 24261010: Allow explicitly whitelisted apps/extensions in public sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix handing of guest user ID. Created 7 years, 2 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/extensions/extension_system.h ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index ef79b6007efcadc61845ef686c495e661e7d16d3..348c5ee08a33e62d5a773c4de56c9fe0c80f1149 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -48,6 +48,10 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h"
+#include "chrome/browser/chromeos/login/user.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/login/login_state.h"
#endif
@@ -107,7 +111,19 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
standard_management_policy_provider_.reset(
new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_)));
-#endif
+
+#if defined (OS_CHROMEOS)
+ const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
+ policy::DeviceLocalAccount::Type device_local_account_type;
+ if (user && policy::IsDeviceLocalAccountUser(user->email(),
+ &device_local_account_type)) {
+ device_local_account_management_policy_provider_.reset(
+ new chromeos::DeviceLocalAccountManagementPolicyProvider(
+ device_local_account_type));
+ }
+#endif // defined (OS_CHROMEOS)
+
+#endif // defined(ENABLE_EXTENSIONS)
}
void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
@@ -116,7 +132,15 @@ void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
DCHECK(standard_management_policy_provider_.get());
management_policy_->RegisterProvider(
standard_management_policy_provider_.get());
-#endif
+
+#if defined (OS_CHROMEOS)
+ if (device_local_account_management_policy_provider_) {
+ management_policy_->RegisterProvider(
+ device_local_account_management_policy_provider_.get());
+ }
+#endif // defined (OS_CHROMEOS)
+
+#endif // defined(ENABLE_EXTENSIONS)
}
void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698