diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 22:17:40 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 22:17:40 +0000 |
commit | a8bb9670c4e3e91c5f081a272a6d51ed8ee76d8f (patch) | |
tree | 77ecaf1ab0b57487accad841b2806aaeb1041f18 /ui/aura/test | |
parent | 986afae849b2403e0b3b159e9bc567aec6624aaa (diff) | |
download | chromium_src-a8bb9670c4e3e91c5f081a272a6d51ed8ee76d8f.zip chromium_src-a8bb9670c4e3e91c5f081a272a6d51ed8ee76d8f.tar.gz chromium_src-a8bb9670c4e3e91c5f081a272a6d51ed8ee76d8f.tar.bz2 |
aura: Ask the WindowDelegate before a Window is Focus()ed.
. In aura, before a window is focused, ask the delegate if it can be focused.
. Make a popup RWHVA non-focusable.
This is to prevent the focus from moving from the main web-page to the combobox (which causes the combobox to get destroyed). This fixes an issue where comboboxes in the login screen could not be used properly.
BUG=105786
TEST=manually
Review URL: http://codereview.chromium.org/8770011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test')
-rw-r--r-- | ui/aura/test/test_window_delegate.cc | 4 | ||||
-rw-r--r-- | ui/aura/test/test_window_delegate.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc index 4244879..4a4f778 100644 --- a/ui/aura/test/test_window_delegate.cc +++ b/ui/aura/test/test_window_delegate.cc @@ -56,6 +56,10 @@ ui::TouchStatus TestWindowDelegate::OnTouchEvent(TouchEvent* event) { return ui::TOUCH_STATUS_UNKNOWN; } +bool TestWindowDelegate::CanFocus() { + return true; +} + bool TestWindowDelegate::ShouldActivate(Event* event) { return true; } diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h index febe663..08f1d6f 100644 --- a/ui/aura/test/test_window_delegate.h +++ b/ui/aura/test/test_window_delegate.h @@ -30,6 +30,7 @@ class TestWindowDelegate : public WindowDelegate { virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; virtual bool OnMouseEvent(MouseEvent* event) OVERRIDE; virtual ui::TouchStatus OnTouchEvent(TouchEvent* event) OVERRIDE; + virtual bool CanFocus() OVERRIDE; virtual bool ShouldActivate(Event* event) OVERRIDE; virtual void OnActivated() OVERRIDE; virtual void OnLostActive() OVERRIDE; |