aura: Fix WidgetFocusChangeListener::OnNativeFocusChange().

ui/views/focus/focus_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
+#include <vector>
+
 #include "base/utf_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/focus_manager_test.h"
+#include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(USE_AURA)
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
 namespace views {
 
 enum FocusTestEventType {
@@ skipping 85 matching lines @@
   view2->RequestFocus();
   ASSERT_EQ(1, static_cast<int>(listener.focus_changes().size()));
   EXPECT_TRUE(listener.focus_changes()[0] == ViewPair(view1, view2));
   listener.ClearFocusChanges();
 
   GetFocusManager()->ClearFocus();
   ASSERT_EQ(1, static_cast<int>(listener.focus_changes().size()));
   EXPECT_TRUE(listener.focus_changes()[0] == ViewPair(view2, null_view));
 }
 
+TEST_F(FocusManagerTest, WidgetFocusChangeListener) {

[Daniel Erat, 2012/06/18 19:25:15]

This test times out on non-Aura Windows.  I know nothing about the Windows focus
model -- is it even possible for child native views to receive the focus, or can
only toplevel ones receive it?  (The comment in NativeWidgetAura::OnFocus()
suggests that the latter may be the case.)

Recommendations for how to make this test relevant / passing on Windows, or
should I just ifdef it to be Aura-only?

+  TestWidgetFocusChangeListener widget_listener;
+  AddWidgetFocusChangeListener(&widget_listener);
+
+  Widget::InitParams params;
+  params.type = views::Widget::InitParams::TYPE_WINDOW;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.bounds = gfx::Rect(10, 10, 100, 100);
+  params.parent_widget = GetWidget();
+
+  scoped_ptr<Widget> widget1(new Widget);
+  widget1->Init(params);
+  widget1->Show();
+
+  scoped_ptr<Widget> widget2(new Widget);
+  widget2->Init(params);
+  widget2->Show();
+
+  widget_listener.ClearFocusChanges();
+  gfx::NativeView native_view1 = widget1->GetNativeView();
+  GetWidget()->FocusNativeView(native_view1);
+  ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
+  EXPECT_EQ(native_view1, widget_listener.focus_changes()[0].second);
+  EXPECT_EQ(native_view1, widget_listener.focus_changes()[1].second);
+
+  widget_listener.ClearFocusChanges();
+  gfx::NativeView native_view2 = widget2->GetNativeView();
+  GetWidget()->FocusNativeView(native_view2);
+  ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
+  EXPECT_EQ(NativeViewPair(native_view1, native_view2),
+            widget_listener.focus_changes()[0]);
+  EXPECT_EQ(NativeViewPair(native_view1, native_view2),
+            widget_listener.focus_changes()[1]);
+}
+
 #if !defined(USE_AURA)
 class TestTextfield : public Textfield {
  public:
   TestTextfield() {}
   virtual gfx::NativeView TestGetNativeControlView() {
     return native_wrapper_->GetTestingHandle();
   }
 };
 
 class TestTabbedPane : public TabbedPane {
@@ skipping 470 matching lines @@
 
   // Test window, button and focus manager should all be destructed.
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 }
 #endif
 
 }  // namespace views