chrome/browser/chromeos/accessibility/accessibility_manager.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/accessibility/accessibility_manager.cc

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

Patch Set: Fix tests. 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 | « no previous file | chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc » ('j') | chrome/browser/chromeos/input_method/input_method_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc

diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc

index 68b23b295da408e41f99ff0c9bcbf29f7cce3d0d..5856c5f203b8fefdb2463bbc7341f2ef539d3f29 100644

--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc

+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -857,7 +857,7 @@ void AccessibilityManager::InputMethodChanged(

manager->IsAltGrUsedByCurrentInputMethod());

#endif

const chromeos::input_method::InputMethodDescriptor descriptor =

- manager->GetCurrentInputMethod();

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

braille_ime_current_ =

(descriptor.id() == extension_misc::kBrailleImeEngineId);

}

@@ -1085,8 +1085,10 @@ void AccessibilityManager::OnBrailleKeyEvent(const KeyEvent& event) {

if ((event.command ==

extensions::api::braille_display_private::KEY_COMMAND_DOTS) &&

!braille_ime_current_) {

- input_method::InputMethodManager::Get()->ChangeInputMethod(

- extension_misc::kBrailleImeEngineId);

+ input_method::InputMethodManager::Get()

+ ->GetActiveIMEState()

+ ->ChangeInputMethod(extension_misc::kBrailleImeEngineId,

+ false /* show_message */);

}