diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 01:22:45 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 01:22:45 +0000 |
| commit | c3a2981a257cc7d4b149a0367c916fc50a4b0e0f (patch) | |
| tree | 71bd1f6b2c923061d1c17037a5278894e0c6b549 /ui/views/widget | |
| parent | 0a12159e5b3473cbc75e8079962d236c5242c811 (diff) | |
| download | chromium_src-c3a2981a257cc7d4b149a0367c916fc50a4b0e0f.zip chromium_src-c3a2981a257cc7d4b149a0367c916fc50a4b0e0f.tar.gz chromium_src-c3a2981a257cc7d4b149a0367c916fc50a4b0e0f.tar.bz2 | |
Window may be invisible in NativeWidgetAura::OnKeyEvent
if the key event is sent back from renderer
BUG=none
TEST=PrintDialogCloudTest.HandlersRegistered becomes non flaky.
Review URL: http://codereview.chromium.org/9309029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index b9ff0a2..4d7a396 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -663,8 +663,10 @@ bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) { // Windows). In this case, we just skip these. return false; } - - DCHECK(window_->IsVisible()); + // Renderer may send a key event back to us if the key event wasn't handled, + // and the window may be invisible by that time. + if (!window_->IsVisible()) + return false; InputMethod* input_method = GetWidget()->GetInputMethod(); DCHECK(input_method); KeyEvent views_event(event); |