Chromium Code Reviews| Index: chrome/browser/browser_process_platform_part_chromeos.cc |
| diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc |
| index 0b77afd0b89ab5008ce319997eb3261f99f2ecf8..3f9f5f0bff068c2f08fbd2bb5ef5ed1da9efbd3a 100644 |
| --- a/chrome/browser/browser_process_platform_part_chromeos.cc |
| +++ b/chrome/browser/browser_process_platform_part_chromeos.cc |
| @@ -4,14 +4,18 @@ |
| #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| +#include "base/command_line.h" |
| #include "base/logging.h" |
| #include "base/time/default_tick_clock.h" |
| #include "base/time/tick_clock.h" |
| #include "chrome/browser/browser_process.h" |
| +#include "chrome/browser/chromeos/login/session/chrome_session_manager.h" |
| #include "chrome/browser/chromeos/memory/oom_priority_manager.h" |
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" |
| +#include "chrome/browser/profiles/profile.h" |
| +#include "components/session_manager/core/session_manager.h" |
| BrowserProcessPlatformPart::BrowserProcessPlatformPart() |
| : created_profile_helper_(false) { |
| @@ -31,6 +35,24 @@ void BrowserProcessPlatformPart::ShutdownAutomaticRebootManager() { |
| automatic_reboot_manager_.reset(); |
| } |
| +void BrowserProcessPlatformPart::InitializeSessionManager( |
| + const base::CommandLine& parsed_command_line, |
| + Profile* profile, |
| + bool is_running_test) { |
| + DCHECK(!session_manager_); |
| + session_manager_ = chromeos::ChromeSessionManager::CreateSessionManager( |
| + parsed_command_line, profile, is_running_test); |
| +} |
| + |
| +void BrowserProcessPlatformPart::ShutdownSessionManager() { |
| + session_manager_.reset(); |
| +} |
| + |
| +session_manager::SessionManager* BrowserProcessPlatformPart::session_manager() { |
| + DCHECK(CalledOnValidThread()); |
|
oshima
2014/07/14 20:03:53
Do you know if there is any particular reason why
Nikita (slow)
2014/07/15 17:47:47
Not quite sure, I've added it btw. Probably just a
|
| + return session_manager_.get(); |
| +} |
| + |
| chromeos::OomPriorityManager* |
| BrowserProcessPlatformPart::oom_priority_manager() { |
| DCHECK(CalledOnValidThread()); |