chrome/browser/chromeos/login/ui/login_display_host_impl.cc - Issue 419293002: IME refactoring: ChromeOS introduce input methods State.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unit test fixed. Re-sorted methods of StateImpl and IMM. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc

index f4b62fc654cfc8f1d60a7691c46be4bfe9dfbc91..09ec89f2c4763c2aef7dc2fdb608facdb95a80fb 100644

--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc

+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc

@@ -1150,7 +1150,7 @@ void ShowLoginWizard(const std::string& first_screen_name) {

// Set up keyboards. For example, when |locale| is "en-US", enable US qwerty

// and US dvorak keyboard layouts.

if (g_browser_process && g_browser_process->local_state()) {

- manager->SetInputMethodLoginDefault();

+ manager->GetActiveIMEState()->SetInputMethodLoginDefault();

PrefService* prefs = g_browser_process->local_state();

// Apply owner preferences for tap-to-click and mouse buttons swap for

@@ -1235,7 +1235,8 @@ void ShowLoginWizard(const std::string& first_screen_name) {

// Determine keyboard layout from OEM customization (if provided) or

// initial locale and save it in preferences.

- manager->SetInputMethodLoginDefaultFromVPD(locale, layout);

+ manager->GetActiveIMEState()->SetInputMethodLoginDefaultFromVPD(locale,

+ layout);

if (!current_locale.empty() || locale.empty()) {

ShowLoginWizardFinish(first_screen_name, startup_manifest, display_host);