From c42dc8d80c2741212a5733fb34914ad3b00ac617 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Thu, 6 Jan 2011 18:32:17 +0000 Subject: focus reverse traversal was not working for TextfieldViews. Both Textfield and TextfieldViews were focusable and alt-tab was setting the focus back to the Textfield, which sets the focus to the its TextfieldViews. This fixes the issue by making Textfield non focusable. BUG=none TEST=FocusTest is added to unittest. Review URL: http://codereview.chromium.org/5988010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70624 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/textfield/native_textfield_views.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'views/controls/textfield/native_textfield_views.h') diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h index cfb47be..3c023ac 100644 --- a/views/controls/textfield/native_textfield_views.h +++ b/views/controls/textfield/native_textfield_views.h @@ -46,11 +46,11 @@ class NativeTextfieldViews : public views::View, virtual bool OnKeyPressed(const views::KeyEvent& e); virtual bool OnKeyReleased(const views::KeyEvent& e); virtual void Paint(gfx::Canvas* canvas); + virtual void DidChangeBounds(const gfx::Rect& previous, + const gfx::Rect& current); virtual void WillGainFocus(); virtual void DidGainFocus(); virtual void WillLoseFocus(); - virtual void DidChangeBounds(const gfx::Rect& previous, - const gfx::Rect& current); // NativeTextfieldWrapper overrides: virtual string16 GetText() const; @@ -66,14 +66,18 @@ class NativeTextfieldViews : public views::View, virtual void UpdateFont(); virtual void UpdateIsPassword(); virtual void UpdateEnabled(); - virtual bool IsPassword(); virtual gfx::Insets CalculateInsets(); virtual void UpdateHorizontalMargins(); virtual void UpdateVerticalMargins(); - virtual void SetFocus(); + virtual bool SetFocus(); virtual View* GetView(); virtual gfx::NativeView GetTestingHandle() const; virtual bool IsIMEComposing() const; + virtual bool HandleKeyPressed(const views::KeyEvent& e); + virtual bool HandleKeyReleased(const views::KeyEvent& e); + virtual void HandleWillGainFocus(); + virtual void HandleDidGainFocus(); + virtual void HandleWillLoseFocus(); // class name of internal static const char kViewClassName[]; -- cgit v1.1