Fixing focus problems with the combobox

views/focus/focus_manager_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 // Disabled right now as this won't work on BuildBots right now as this test
 // require the box it runs on to be unlocked (and no screen-savers).
 // The test actually simulates mouse and key events, so if the screen is locked,
 // the events don't go to the Chrome window.
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/combobox/combobox.h"
+#include "views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/tabbed_pane.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/widget/accelerator_handler.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 #include "views/window/window_delegate.h"
 #include "views/window/window_win.h"
@@ skipping 687 matching lines @@
 };
 
 class TestTextfield : public Textfield {
  public:
   TestTextfield() { }
   virtual HWND TestGetNativeComponent() {
     return native_wrapper_->GetTestingHandle();
   }
 };
 
+class TestCombobox : public Combobox, public Combobox::Model {
+ public:
+  TestCombobox() : Combobox(this) { }
+  virtual HWND TestGetNativeComponent() {
+    return native_wrapper_->GetTestingHandle();
+  }
+  virtual int GetItemCount(Combobox* source) {
+    return 10;
+  }
+  virtual std::wstring GetItemAt(Combobox* source, int index) {
+    return L"Hello combo";
+  }
+};
+
 class TestTabbedPane : public TabbedPane {
  public:
   TestTabbedPane() { }
   virtual HWND TestGetNativeControlHWND() {
     return GetNativeControlHWND();
   }
 };
 
 // Tests that NativeControls do set the focus View appropriately on the
 // FocusManager.
 TEST_F(FocusManagerTest, FocusNativeControls) {
   TestNativeButton* button = new TestNativeButton(L"Press me");
   TestCheckbox* checkbox = new TestCheckbox(L"Checkbox");
   TestRadioButton* radio_button = new TestRadioButton(L"RadioButton");
   TestTextfield* textfield = new TestTextfield();
+  TestCombobox* combobox = new TestCombobox();
   TestTabbedPane* tabbed_pane = new TestTabbedPane();
   TestNativeButton* tab_button = new TestNativeButton(L"tab button");
 
   content_view_->AddChildView(button);
   content_view_->AddChildView(checkbox);
   content_view_->AddChildView(radio_button);
   content_view_->AddChildView(textfield);
+  content_view_->AddChildView(combobox);
   content_view_->AddChildView(tabbed_pane);
   tabbed_pane->AddTab(L"Awesome tab", tab_button);
 
   // Simulate the native HWNDs getting the native focus.
   ::SendMessage(button->TestGetNativeControlHWND(), WM_SETFOCUS, NULL, NULL);
   EXPECT_EQ(button, GetFocusManager()->GetFocusedView());
 
   ::SendMessage(checkbox->TestGetNativeControlHWND(), WM_SETFOCUS, NULL, NULL);
   EXPECT_EQ(checkbox, GetFocusManager()->GetFocusedView());
 
   ::SendMessage(radio_button->TestGetNativeControlHWND(), WM_SETFOCUS,
                 NULL, NULL);
   EXPECT_EQ(radio_button, GetFocusManager()->GetFocusedView());
 
   ::SendMessage(textfield->TestGetNativeComponent(), WM_SETFOCUS, NULL, NULL);
   EXPECT_EQ(textfield, GetFocusManager()->GetFocusedView());
 
+  ::SendMessage(combobox->TestGetNativeComponent(), WM_SETFOCUS, NULL, NULL);
+  EXPECT_EQ(combobox, GetFocusManager()->GetFocusedView());
+
   ::SendMessage(tabbed_pane->TestGetNativeControlHWND(), WM_SETFOCUS,
                 NULL, NULL);
   EXPECT_EQ(tabbed_pane, GetFocusManager()->GetFocusedView());
 
   ::SendMessage(tab_button->TestGetNativeControlHWND(), WM_SETFOCUS,
                 NULL, NULL);
   EXPECT_EQ(tab_button, GetFocusManager()->GetFocusedView());
 }
 
 // Test that when activating/deactivating the top window, the focus is stored/
@@ skipping 331 matching lines @@
   EXPECT_EQ(target.accelerator_count(), 1);
   EXPECT_EQ(NULL,
             focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
 
   // Hitting the return key again; nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
 }
 
 }  // namespace views