Fixing focus problems with the combobox

views/controls/combobox/native_combobox_win.cc

 // Copyright (c) 2009 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 "views/controls/combobox/native_combobox_win.h"
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
@@ skipping 118 matching lines @@
 }
 
 View* NativeComboboxWin::GetView() {
   return this;
 }
 
 void NativeComboboxWin::SetFocus() {
   Focus();
 }
 
+gfx::NativeView NativeComboboxWin::GetTestingHandle() const {
+  return native_view();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWin, NativeControlWin overrides:
 
 bool NativeComboboxWin::ProcessMessage(UINT message,
                                        WPARAM w_param,
                                        LPARAM l_param,
                                        LRESULT* result) {
   if (message == WM_COMMAND && HIWORD(w_param) == CBN_SELCHANGE) {
     combobox_->SelectionChanged();
     *result = 0;
     return true;
   }
   return NativeControlWin::ProcessMessage(message, w_param, l_param, result);
 }
 
 void NativeComboboxWin::CreateNativeControl() {
   // It's ok to add WS_VSCROLL. The scrollbar will show up only when necessary
   // as long as we don't use CBS_DISABLENOSCROLL.
   // See http://msdn.microsoft.com/en-us/library/7h63bxbe(VS.80).aspx
   DWORD flags = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
                 CBS_DROPDOWNLIST | WS_VSCROLL;
   HWND control_hwnd = ::CreateWindowEx(GetAdditionalExStyle(), L"COMBOBOX", L"",
-                                       flags, 0, 0, 100, 20, //width(), height(),
+                                       flags, 0, 0, width(), height(),
                                        GetWidget()->GetNativeView(), NULL, NULL,
                                        NULL);
   NativeControlCreated(control_hwnd);
 }
 
 void NativeComboboxWin::NativeControlCreated(HWND native_control) {
   NativeControlWin::NativeControlCreated(native_control);
 
   UpdateFont();
   UpdateFromModel();
@@ skipping 11 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWrapper, public:
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxWin(combobox);
 }
 
 }  // namespace views