summaryrefslogtreecommitdiffstats
path: root/ui/aura/demo
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 23:27:40 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 23:27:40 +0000
commit87a4b990583c80a24b2122662beebc63e7b96451 (patch)
tree70a000af2b45c1465eaf5f49dc8a1c67d83aa12c /ui/aura/demo
parent1fe51aca23ab7d0d9286045077d0c50f0ddabddd (diff)
downloadchromium_src-87a4b990583c80a24b2122662beebc63e7b96451.zip
chromium_src-87a4b990583c80a24b2122662beebc63e7b96451.tar.gz
chromium_src-87a4b990583c80a24b2122662beebc63e7b96451.tar.bz2
aura: Fix WidgetFocusChangeListener::OnNativeFocusChange().
In Aura, we were passing the newly-focused view through views::WidgetFocusManager::OnWidgetFocusEvent()'s "focused_before" parameter. This made us not close extension popups when they lost the focus. (Note that a popup still doesn't get closed upon clicking outside of the popup on the desktop, presumably because the popup retains the focus in Ash.) BUG=132697 TEST=added, also manual testing Review URL: https://chromiumcodereview.appspot.com/10562025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/demo')
-rw-r--r--ui/aura/demo/demo_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 530dc52..da57329a 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -39,7 +39,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {
}
virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) OVERRIDE {}
- virtual void OnFocus() OVERRIDE {}
+ virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE {}
virtual void OnBlur() OVERRIDE {}
virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE {
return false;