More FocusManager hookup.

- One focus manager per Widget hierarchy
- Create focus manager on widget initialization
- Allow focus manager to be obtained from NativeView.
- Adds a test to ensure focus manager is only created for the top level widget.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6349057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73551 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 13 deletions

diff --git a/ui/views/widget/native_widget_win_unittest.cc b/ui/views/widget/native_widget_win_unittest.cc
index b5cdf04..da7e6ae 100644
--- a/ui/views/widget/native_widget_win_unittest.cc
+++ b/ui/views/widget/native_widget_win_unittest.cc
@@ -7,6 +7,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_test_util.h"
 
 namespace ui {
 
@@ -15,13 +16,6 @@ class NativeWidgetTest : public testing::Test {
   NativeWidgetTest() {}
   virtual ~NativeWidgetTest() {}
 
-  Widget* CreateWidget() const {
-    Widget* widget = new Widget(new View);
-    widget->set_delete_on_destroy(false);
-    widget->InitWithNativeViewParent(NULL, gfx::Rect(10, 10, 200, 200));
-    return widget;
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetTest);
 };
@@ -45,12 +39,12 @@ class TestWindowImpl : public WindowImpl {
 };
 
 TEST_F(NativeWidgetTest, CreateNativeWidget) {
-  scoped_ptr<Widget> widget(CreateWidget());
+  scoped_ptr<Widget> widget(internal::CreateWidget());
   EXPECT_TRUE(widget->native_widget()->GetNativeView() != NULL);
 }
 
 TEST_F(NativeWidgetTest, GetNativeWidgetForNativeView) {
-  scoped_ptr<Widget> widget(CreateWidget());
+  scoped_ptr<Widget> widget(internal::CreateWidget());
   NativeWidget* a = widget->native_widget();
   HWND nv = widget->native_widget()->GetNativeView();
   NativeWidget* b = NativeWidget::GetNativeWidgetForNativeView(nv);
@@ -59,7 +53,7 @@ TEST_F(NativeWidgetTest, GetNativeWidgetForNativeView) {
 
 // |widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
-  scoped_ptr<Widget> widget(CreateWidget());
+  scoped_ptr<Widget> widget(internal::CreateWidget());
   EXPECT_EQ(widget->native_widget(),
             NativeWidget::GetTopLevelNativeWidget(
                 widget->native_widget()->GetNativeView()));
@@ -67,8 +61,8 @@ TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
 
 // |toplevel_widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget2) {
-  scoped_ptr<Widget> child_widget(CreateWidget());
-  scoped_ptr<Widget> toplevel_widget(CreateWidget());
+  scoped_ptr<Widget> child_widget(internal::CreateWidget());
+  scoped_ptr<Widget> toplevel_widget(internal::CreateWidget());
   SetParent(child_widget->native_widget()->GetNativeView(),
             toplevel_widget->native_widget()->GetNativeView());
   EXPECT_EQ(toplevel_widget->native_widget(),
@@ -78,7 +72,7 @@ TEST_F(NativeWidgetTest, GetTopLevelNativeWidget2) {
 
 // |child_widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget3) {
-  scoped_ptr<Widget> child_widget(CreateWidget());
+  scoped_ptr<Widget> child_widget(internal::CreateWidget());
 
   TestWindowImpl toplevel;
   toplevel.Init(NULL, gfx::Rect(10, 10, 100, 100));