OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" | 5 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cstddef> | 9 #include <cstddef> |
10 #include <set> | 10 #include <set> |
(...skipping 14 matching lines...) Expand all Loading... | |
25 #include "base/strings/stringprintf.h" | 25 #include "base/strings/stringprintf.h" |
26 #include "base/strings/utf_string_conversions.h" | 26 #include "base/strings/utf_string_conversions.h" |
27 #include "base/sys_info.h" | 27 #include "base/sys_info.h" |
28 #include "base/task_runner.h" | 28 #include "base/task_runner.h" |
29 #include "base/task_scheduler/post_task.h" | 29 #include "base/task_scheduler/post_task.h" |
30 #include "base/threading/thread_task_runner_handle.h" | 30 #include "base/threading/thread_task_runner_handle.h" |
31 #include "base/values.h" | 31 #include "base/values.h" |
32 #include "chrome/browser/browser_process.h" | 32 #include "chrome/browser/browser_process.h" |
33 #include "chrome/browser/chrome_notification_types.h" | 33 #include "chrome/browser/chrome_notification_types.h" |
34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 34 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
35 #include "chrome/browser/chromeos/extensions/active_tab_permission_granter_deleg ate_chromeos.h" | |
35 #include "chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeo s.h" | 36 #include "chrome/browser/chromeos/extensions/extension_tab_util_delegate_chromeo s.h" |
36 #include "chrome/browser/chromeos/extensions/permissions_updater_delegate_chrome os.h" | 37 #include "chrome/browser/chromeos/extensions/permissions_updater_delegate_chrome os.h" |
37 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" | 38 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
38 #include "chrome/browser/chromeos/login/enterprise_user_session_metrics.h" | 39 #include "chrome/browser/chromeos/login/enterprise_user_session_metrics.h" |
39 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 40 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
40 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h" | 41 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h" |
41 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h" | 42 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h" |
42 #include "chrome/browser/chromeos/login/users/affiliation.h" | 43 #include "chrome/browser/chromeos/login/users/affiliation.h" |
43 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" | 44 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" |
44 #include "chrome/browser/chromeos/login/users/chrome_user_manager_util.h" | 45 #include "chrome/browser/chromeos/login/users/chrome_user_manager_util.h" |
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
843 // browser process during logout (the browser process is destroyed during | 844 // browser process during logout (the browser process is destroyed during |
844 // logout), ie. it's not freed and it leaks but that is fine. | 845 // logout), ie. it's not freed and it leaks but that is fine. |
845 extensions::PermissionsUpdater::SetPlatformDelegate( | 846 extensions::PermissionsUpdater::SetPlatformDelegate( |
846 new extensions::PermissionsUpdaterDelegateChromeOS); | 847 new extensions::PermissionsUpdaterDelegateChromeOS); |
847 | 848 |
848 // In Public Sessions set the PS delegate on ExtensionTabUtil (used to scrub | 849 // In Public Sessions set the PS delegate on ExtensionTabUtil (used to scrub |
849 // URL down to origin for security reasons). See comment above about | 850 // URL down to origin for security reasons). See comment above about |
850 // PermissionsUpdaterDelegateChromeOS for more info. | 851 // PermissionsUpdaterDelegateChromeOS for more info. |
851 extensions::ExtensionTabUtil::SetPlatformDelegate( | 852 extensions::ExtensionTabUtil::SetPlatformDelegate( |
852 new extensions::ExtensionTabUtilDelegateChromeOS); | 853 new extensions::ExtensionTabUtilDelegateChromeOS); |
854 | |
855 // In Public Sessions set the PS delegate on ActiveTabPermissionGranter (used | |
856 // to ask the user for activeTab permission for security reasons). See comment | |
857 // above about PermissionsUpdaterDelegateChromeOS for more info. | |
858 extensions::ActiveTabPermissionGranter::SetPlatformDelegate( | |
Ivan Šandrk
2017/05/05 16:24:27
At this point might as well break out this delegat
| |
859 new extensions::ActiveTabPermissionGranterDelegateChromeOS); | |
853 } | 860 } |
854 | 861 |
855 void ChromeUserManagerImpl::KioskAppLoggedIn(user_manager::User* user) { | 862 void ChromeUserManagerImpl::KioskAppLoggedIn(user_manager::User* user) { |
856 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 863 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
857 | 864 |
858 active_user_ = user; | 865 active_user_ = user; |
859 active_user_->SetStubImage( | 866 active_user_->SetStubImage( |
860 base::MakeUnique<user_manager::UserImage>( | 867 base::MakeUnique<user_manager::UserImage>( |
861 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 868 *ResourceBundle::GetSharedInstance().GetImageSkiaNamed( |
862 IDR_PROFILE_PICTURE_LOADING)), | 869 IDR_PROFILE_PICTURE_LOADING)), |
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1380 break; | 1387 break; |
1381 default: | 1388 default: |
1382 NOTREACHED(); | 1389 NOTREACHED(); |
1383 break; | 1390 break; |
1384 } | 1391 } |
1385 | 1392 |
1386 return user; | 1393 return user; |
1387 } | 1394 } |
1388 | 1395 |
1389 } // namespace chromeos | 1396 } // namespace chromeos |
OLD | NEW |