Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 48 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
| 49 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" | 49 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" |
| 50 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 50 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
| 51 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 51 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
| 52 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" | 52 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" |
| 53 #include "chrome/browser/chromeos/external_metrics.h" | 53 #include "chrome/browser/chromeos/external_metrics.h" |
| 54 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 54 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 55 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 55 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 56 #include "chrome/browser/chromeos/language_preferences.h" | 56 #include "chrome/browser/chromeos/language_preferences.h" |
| 57 #include "chrome/browser/chromeos/libc_close_tracking.h" | 57 #include "chrome/browser/chromeos/libc_close_tracking.h" |
| 58 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h" | |
| 58 #include "chrome/browser/chromeos/login/helper.h" | 59 #include "chrome/browser/chromeos/login/helper.h" |
| 59 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 60 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 60 #include "chrome/browser/chromeos/login/login_wizard.h" | 61 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 61 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" | 62 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" |
| 62 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 63 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 63 #include "chrome/browser/chromeos/login/startup_utils.h" | 64 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 64 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 65 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 65 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 66 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 66 #include "chrome/browser/chromeos/login/wizard_controller.h" | 67 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 67 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" | 68 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 599 printing::PrintBackend::SetNativeCupsEnabled( | 600 printing::PrintBackend::SetNativeCupsEnabled( |
| 600 !parsed_command_line().HasSwitch(::switches::kDisableNativeCups)); | 601 !parsed_command_line().HasSwitch(::switches::kDisableNativeCups)); |
| 601 | 602 |
| 602 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get())); | 603 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get())); |
| 603 | 604 |
| 604 arc_kiosk_app_manager_.reset(new ArcKioskAppManager()); | 605 arc_kiosk_app_manager_.reset(new ArcKioskAppManager()); |
| 605 | 606 |
| 606 // In Aura builds this will initialize ash::Shell. | 607 // In Aura builds this will initialize ash::Shell. |
| 607 ChromeBrowserMainPartsLinux::PreProfileInit(); | 608 ChromeBrowserMainPartsLinux::PreProfileInit(); |
| 608 | 609 |
| 610 if (lock_screen_apps::StateController::IsEnabled()) { | |
| 611 lock_screen_apps_state_controller_.reset( | |
|
James Cook
2017/05/05 17:22:46
nit: base::MakeUnique
tbarzic
2017/05/05 17:51:18
Done.
| |
| 612 new lock_screen_apps::StateController()); | |
| 613 lock_screen_apps_state_controller_->Initialize(); | |
| 614 } | |
| 615 | |
| 609 if (immediate_login) { | 616 if (immediate_login) { |
| 610 const std::string cryptohome_id = | 617 const std::string cryptohome_id = |
| 611 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); | 618 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); |
| 612 const AccountId account_id( | 619 const AccountId account_id( |
| 613 cryptohome::Identification::FromString(cryptohome_id).GetAccountId()); | 620 cryptohome::Identification::FromString(cryptohome_id).GetAccountId()); |
| 614 | 621 |
| 615 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 622 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
| 616 | 623 |
| 617 if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), nullptr) && | 624 if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), nullptr) && |
| 618 !user_manager->IsKnownUser(account_id)) { | 625 !user_manager->IsKnownUser(account_id)) { |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 852 | 859 |
| 853 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 860 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
| 854 } | 861 } |
| 855 | 862 |
| 856 // Shut down services before the browser process, etc are destroyed. | 863 // Shut down services before the browser process, etc are destroyed. |
| 857 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 864 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| 858 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); | 865 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); |
| 859 | 866 |
| 860 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); | 867 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
| 861 | 868 |
| 869 lock_screen_apps_state_controller_.reset(); | |
| 870 | |
| 862 // This must be shut down before |arc_service_launcher_|. | 871 // This must be shut down before |arc_service_launcher_|. |
| 863 NoteTakingHelper::Shutdown(); | 872 NoteTakingHelper::Shutdown(); |
| 864 | 873 |
| 865 arc_service_launcher_->Shutdown(); | 874 arc_service_launcher_->Shutdown(); |
| 866 | 875 |
| 867 // Unregister CrosSettings observers before CrosSettings is destroyed. | 876 // Unregister CrosSettings observers before CrosSettings is destroyed. |
| 868 shutdown_policy_forwarder_.reset(); | 877 shutdown_policy_forwarder_.reset(); |
| 869 | 878 |
| 870 // Destroy the application name notifier for Kiosk mode. | 879 // Destroy the application name notifier for Kiosk mode. |
| 871 KioskModeIdleAppNameNotification::Shutdown(); | 880 KioskModeIdleAppNameNotification::Shutdown(); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 992 | 1001 |
| 993 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 1002 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 994 | 1003 |
| 995 // Destroy DeviceSettingsService after g_browser_process. | 1004 // Destroy DeviceSettingsService after g_browser_process. |
| 996 DeviceSettingsService::Shutdown(); | 1005 DeviceSettingsService::Shutdown(); |
| 997 | 1006 |
| 998 chromeos::ShutdownCloseTracking(); | 1007 chromeos::ShutdownCloseTracking(); |
| 999 } | 1008 } |
| 1000 | 1009 |
| 1001 } // namespace chromeos | 1010 } // namespace chromeos |
| OLD | NEW |