chrome/browser/chromeos/input_method/mock_xkeyboard.h - Issue 10383301: Move modifier remapping code from X to Ash

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/input_method/mock_xkeyboard.h

Issue 10383301: Move modifier remapping code from X to Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: reverted ui/base/keycodes/keyboard_code_conversion_x.cc (this was just for debugging) Created 8 years, 7 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:

Index: chrome/browser/chromeos/input_method/mock_xkeyboard.h

diff --git a/chrome/browser/chromeos/input_method/mock_xkeyboard.h b/chrome/browser/chromeos/input_method/mock_xkeyboard.h

index fc42aa742a53a73d2de4a4317db6ab3d731453d0..13a164955ccd427cdb933a264aca166d617758a4 100644

--- a/chrome/browser/chromeos/input_method/mock_xkeyboard.h

+++ b/chrome/browser/chromeos/input_method/mock_xkeyboard.h

@@ -22,7 +22,6 @@ class MockXKeyboard : public XKeyboard {

virtual bool SetCurrentKeyboardLayoutByName(

const std::string& layout_name) OVERRIDE;

- virtual bool RemapModifierKeys(const ModifierMap& modifier_map) OVERRIDE;

virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE;

virtual void ReapplyCurrentModifierLockStatus() OVERRIDE;

virtual void SetLockedModifiers(

@@ -33,8 +32,7 @@ class MockXKeyboard : public XKeyboard {

virtual bool NumLockIsEnabled() OVERRIDE;

virtual bool CapsLockIsEnabled() OVERRIDE;

virtual std::string CreateFullXkbLayoutName(

- const std::string& layout_name,

- const ModifierMap& modifire_map) OVERRIDE;

+ const std::string& layout_name) OVERRIDE;

virtual unsigned int GetNumLockMask() OVERRIDE;

virtual void GetLockedModifiers(bool* out_caps_lock_enabled,

bool* out_num_lock_enabled) OVERRIDE;

« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/mock_xkeyboard.cc » ('j') | no next file with comments »