ui/views/controls/textfield/native_textfield_views.cc - Issue 10412009: Enable disabled omnibox tests on aura

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: ui/views/controls/textfield/native_textfield_views.cc

Issue 10412009: Enable disabled omnibox tests on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync 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:

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

Download patch

« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.cc ('k') | ui/views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/textfield/native_textfield_views.cc

diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc

index 35fe3e25517c9c163a1b9cf07428e25116490fc4..03086b8bb40f4d7055568758d792225a96e37b52 100644

--- a/ui/views/controls/textfield/native_textfield_views.cc

+++ b/ui/views/controls/textfield/native_textfield_views.cc

@@ -860,14 +860,16 @@ bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {

OnBeforeUserAction();

bool editable = !textfield_->read_only();

bool readable = !textfield_->IsObscured();

- bool selection = key_event.IsShiftDown();

+ bool shift = key_event.IsShiftDown();

bool control = key_event.IsControlDown();

bool text_changed = false;

bool cursor_changed = false;

switch (key_code) {

case ui::VKEY_Z:

- if (control && editable)

+ if (control && !shift && editable)

cursor_changed = text_changed = model_->Undo();

+ else if (control && shift && editable)

+ cursor_changed = text_changed = model_->Redo();

break;

case ui::VKEY_Y:

if (control && editable)

@@ -896,16 +898,16 @@ bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {

model_->MoveCursor(

control ? gfx::WORD_BREAK : gfx::CHARACTER_BREAK,

(key_code == ui::VKEY_RIGHT) ? gfx::CURSOR_RIGHT : gfx::CURSOR_LEFT,

- selection);

+ shift);

cursor_changed = true;

break;

case ui::VKEY_END:

case ui::VKEY_HOME:

if ((key_code == ui::VKEY_HOME) ==

(GetRenderText()->GetTextDirection() == base::i18n::RIGHT_TO_LEFT))

- model_->MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_RIGHT, selection);

+ model_->MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_RIGHT, shift);

else

- model_->MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_LEFT, selection);

+ model_->MoveCursor(gfx::LINE_BREAK, gfx::CURSOR_LEFT, shift);

cursor_changed = true;

break;

case ui::VKEY_BACK:

@@ -915,7 +917,7 @@ bool NativeTextfieldViews::HandleKeyEvent(const KeyEvent& key_event) {

if (!model_->HasSelection()) {

gfx::VisualCursorDirection direction = (key_code == ui::VKEY_DELETE) ?

gfx::CURSOR_RIGHT : gfx::CURSOR_LEFT;

- if (selection && control) {

+ if (shift && control) {

// If both shift and control are pressed, then erase up to the

// beginning/end of the buffer in ChromeOS. In windows, do nothing.

#if defined(OS_WIN)