chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc - Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone

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/events/xinput_hierarchy_changed_event_listener.cc

Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rename to ImeKeyboard & rebase Created 6 years, 8 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/events/system_key_event_listener.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc

diff --git a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc

index c50ab710259603a6cda4c37434585c15a70ca2f5..6f78792b5035a40b6dcc1fc0d2d2d75a7967e492 100644

--- a/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc

+++ b/chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc

@@ -7,8 +7,8 @@

#include <X11/extensions/XInput2.h>

#include <X11/Xlib.h>

+#include "chromeos/ime/ime_keyboard.h"

#include "chromeos/ime/input_method_manager.h"

-#include "chromeos/ime/xkeyboard.h"

#include "ui/base/x/x11_util.h"

#include "ui/events/platform/platform_event_source.h"

@@ -41,10 +41,10 @@ void HandleHierarchyChangedEvent(

if (update_keyboard_status) {

chromeos::input_method::InputMethodManager* input_method_manager =

chromeos::input_method::InputMethodManager::Get();

- chromeos::input_method::XKeyboard* xkeyboard =

- input_method_manager->GetXKeyboard();

- xkeyboard->ReapplyCurrentModifierLockStatus();

- xkeyboard->ReapplyCurrentKeyboardLayout();

+ chromeos::input_method::ImeKeyboard* keyboard =

+ input_method_manager->GetImeKeyboard();

+ keyboard->ReapplyCurrentModifierLockStatus();

+ keyboard->ReapplyCurrentKeyboardLayout();

}