Chromium Code Reviews| Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| index 62166509cb517b8c5b5a2043c96061199416145e..69656a966456054f6895d29e2a6196f01150801a 100644 |
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc |
| @@ -32,6 +32,7 @@ |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/chrome_notification_types.h" |
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| +#include "chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.h" |
| #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
| #include "chrome/browser/chromeos/login/enterprise_user_session_metrics.h" |
| #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| @@ -51,6 +52,7 @@ |
| #include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chrome/browser/chromeos/system/timezone_resolver_manager.h" |
| #include "chrome/browser/chromeos/system/timezone_util.h" |
| +#include "chrome/browser/extensions/permissions_updater.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/signin/easy_unlock_service.h" |
| #include "chrome/browser/supervised_user/chromeos/manager_password_service_factory.h" |
| @@ -833,6 +835,11 @@ void ChromeUserManagerImpl::PublicAccountUserLoggedIn( |
| // prevent the avatar from getting changed. |
| GetUserImageManager(user->GetAccountId())->UserLoggedIn(false, true); |
| WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded(); |
| + |
| + // In Public Sessions set the PS delegate on PermissionsUpdater (used to |
| + // remove clipboard read permission from extensions in PS). |
| + extensions::PermissionsUpdater::SetPlatformDelegate( |
| + new extensions::PermissionsUpdaterDelegateChromeOS); |
|
Devlin
2017/04/08 00:30:51
This will leak - is that intentional?
Ivan Šandrk
2017/04/10 12:04:35
Yes. It's set once during login into Public Sessio
|
| } |
| void ChromeUserManagerImpl::KioskAppLoggedIn(user_manager::User* user) { |