Chromium Code Reviews| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| index 2dbda14ecf242471155366f32f4231e7ca0f22e9..41023677fee80c9820631cf1b85d693a6a64e19c 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -55,6 +55,7 @@ |
| #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| #include "chrome/browser/chromeos/language_preferences.h" |
| #include "chrome/browser/chromeos/libc_close_tracking.h" |
| +#include "chrome/browser/chromeos/lock_screen_apps/state_controller.h" |
| #include "chrome/browser/chromeos/login/helper.h" |
| #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| #include "chrome/browser/chromeos/login/login_wizard.h" |
| @@ -606,6 +607,12 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| // In Aura builds this will initialize ash::Shell. |
| ChromeBrowserMainPartsLinux::PreProfileInit(); |
| + if (lock_screen_apps::StateController::IsEnabled()) { |
| + 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.
|
| + new lock_screen_apps::StateController()); |
| + lock_screen_apps_state_controller_->Initialize(); |
| + } |
| + |
| if (immediate_login) { |
| const std::string cryptohome_id = |
| parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); |
| @@ -859,6 +866,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
| + lock_screen_apps_state_controller_.reset(); |
| + |
| // This must be shut down before |arc_service_launcher_|. |
| NoteTakingHelper::Shutdown(); |