diff options
| -rw-r--r-- | ui/aura/root_window.cc | 5 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index c164ad2..ffa6aa2 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -726,9 +726,10 @@ void RootWindow::SetFocusedWindow(Window* focused_window) { return; } - if (focused_window_ && focused_window_->delegate()) - focused_window_->delegate()->OnBlur(); + Window* old_focused_window = focused_window_; focused_window_ = focused_window; + if (old_focused_window && old_focused_window->delegate()) + old_focused_window->delegate()->OnBlur(); if (focused_window_ && focused_window_->delegate()) focused_window_->delegate()->OnFocus(); if (focused_window_) { diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 341355c..c01a2bd 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -669,7 +669,7 @@ void NativeWidgetAura::OnBlur() { InputMethod* input_method = widget->GetInputMethod(); input_method->OnBlur(); } - delegate_->OnNativeBlur(NULL); + delegate_->OnNativeBlur(window_->GetFocusManager()->GetFocusedWindow()); } bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) { |