Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: ui/aura/focus_manager.cc

Issue 10562025: aura: Fix WidgetFocusChangeListener::OnNativeFocusChange(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 8 years, 6 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
Index: ui/aura/focus_manager.cc
diff --git a/ui/aura/focus_manager.cc b/ui/aura/focus_manager.cc
index 475c0e3d1be2a3258d895beb2b306111a1b6d3b0..fc963ec4ecc7f6782da7738868f9009a5f261c62 100644
--- a/ui/aura/focus_manager.cc
+++ b/ui/aura/focus_manager.cc
@@ -48,7 +48,7 @@ void FocusManager::SetFocusedWindow(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();
+ focused_window_->delegate()->OnFocus(old_focused_window);
if (focused_window_) {
FOR_EACH_OBSERVER(FocusChangeObserver, observers_,
OnWindowFocused(focused_window));

Powered by Google App Engine
This is Rietveld 408576698