chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc - Issue 1284433002: Revise ui::DomKey to unify character and non-character codes.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc

Issue 1284433002: Revise ui::DomKey to unify character and non-character codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanup Created 5 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine.cc » ('j') | ui/base/ime/chromeos/character_composer.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"	5 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"

6	6

7 #include "chrome/browser/chromeos/events/event_rewriter.h"	7 #include "chrome/browser/chromeos/events/event_rewriter.h"

8 #include "chrome/browser/chromeos/system/input_device_settings.h"	8 #include "chrome/browser/chromeos/system/input_device_settings.h"

9 #include "components/user_manager/user_manager.h"	9 #include "components/user_manager/user_manager.h"

10 #include "ui/events/event.h"	10 #include "ui/events/event.h"

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT &&	74 if (key_code != ui::VKEY_LEFT && key_code != ui::VKEY_RIGHT &&

75 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN &&	75 key_code != ui::VKEY_UP && key_code != ui::VKEY_DOWN &&

76 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) {	76 key_code != ui::VKEY_RETURN && key_code != ui::VKEY_F6) {

77 return ui::EVENT_REWRITE_CONTINUE;	77 return ui::EVENT_REWRITE_CONTINUE;

78 }	78 }

79	79

80 chromeos::EventRewriter::MutableKeyState state = {	80 chromeos::EventRewriter::MutableKeyState state = {

81 flags & ~(ui::EF_CONTROL_DOWN \| ui::EF_ALT_DOWN \| ui::EF_SHIFT_DOWN),	81 flags & ~(ui::EF_CONTROL_DOWN \| ui::EF_ALT_DOWN \| ui::EF_SHIFT_DOWN),

82 key_event.code(),	82 key_event.code(),

83 key_event.GetDomKey(),	83 key_event.GetDomKey(),

84 key_event.GetCharacter(),

85 key_event.key_code()};	84 key_event.key_code()};

86	85

87 chromeos::EventRewriter::BuildRewrittenKeyEvent(key_event, state,	86 chromeos::EventRewriter::BuildRewrittenKeyEvent(key_event, state,

88 rewritten_event);	87 rewritten_event);

89 return ui::EVENT_REWRITE_REWRITTEN;	88 return ui::EVENT_REWRITE_REWRITTEN;

90 }	89 }

91	90

92 } // namespace chromeos	91 } // namespace chromeos

OLD	NEW