Commit 829e2bf7 authored by alemate's avatar alemate Committed by Commit bot

ChromeOS: GetProfileByUser should not be called from Preferences::Init.

This fixes crash, because GetProfileByUser is now returning NULL there.

BUG=411216, 410617
TEST=manual

Review URL: https://codereview.chromium.org/543163002

Cr-Commit-Position: refs/heads/master@{#293614}
parent abce781d
...@@ -367,8 +367,7 @@ void Preferences::Init(Profile* profile, const user_manager::User* user) { ...@@ -367,8 +367,7 @@ void Preferences::Init(Profile* profile, const user_manager::User* user) {
UserSessionManager* session_manager = UserSessionManager::GetInstance(); UserSessionManager* session_manager = UserSessionManager::GetInstance();
DCHECK(session_manager); DCHECK(session_manager);
ime_state_ = session_manager->GetDefaultIMEState( ime_state_ = session_manager->GetDefaultIMEState(profile);
ProfileHelper::Get()->GetProfileByUser(user_));
input_method_manager_->SetState(ime_state_); input_method_manager_->SetState(ime_state_);
// Initialize preferences to currently saved state. // Initialize preferences to currently saved state.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment