Fix for native button focus bug

chrome/views/controls/button/native_button_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 "chrome/views/controls/button/native_button_win.h"
 
 #include "base/logging.h"
 #include "chrome/views/controls/button/checkbox.h"
 #include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/controls/button/radio_button.h"
 #include "chrome/views/widget/widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, public:
 
 NativeButtonWin::NativeButtonWin(NativeButton* native_button)
     : NativeControlWin(),
       native_button_(native_button) {
+  // Associates the actual HWND with the native_button so the native_button is
+  // the one considered as having the focus (not the wrapper) when the HWND is
+  // focused directly (with a click for example).
+  SetAssociatedFocusView(native_button);
 }
 
 NativeButtonWin::~NativeButtonWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, NativeButtonWrapper implementation:
 
 void NativeButtonWin::UpdateLabel() {
   SetWindowText(GetHWND(), native_button_->label().c_str());
@@ skipping 10 matching lines @@
     SendMessage(GetHWND(), BM_SETSTYLE,
                 native_button_->is_default() ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON,
                 true);
   }
 }
 
 View* NativeButtonWin::GetView() {
   return this;
 }
 
+void NativeButtonWin::SetFocus() {
+  // Focus the associated HWND.
+  Focus();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, View overrides:
 
 gfx::Size NativeButtonWin::GetPreferredSize() {
   SIZE sz = {0};
   SendMessage(GetHWND(), BCM_GETIDEALSIZE, 0, reinterpret_cast<LPARAM>(&sz));
 
   return gfx::Size(sz.cx, sz.cy);
 }
 
@@ skipping 67 matching lines @@
 
 void NativeCheckboxWin::UpdateChecked() {
   SendMessage(GetHWND(), BM_SETCHECK,
               checkbox_->checked() ? BST_CHECKED : BST_UNCHECKED, 0);
 }
 
 void NativeCheckboxWin::SetPushed(bool pushed) {
   SendMessage(GetHWND(), BM_SETSTATE, pushed, 0);
 }
 
+void NativeCheckboxWin::SetFocus() {
+  // The focus should stay on the views::Checkbox (more precisely, on the
+  // label, which is a view).
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeCheckboxWin, NativeButtonWin overrides:
 
 LRESULT NativeCheckboxWin::ProcessMessage(UINT message,
                                           WPARAM w_param,
                                           LPARAM l_param) {
   if (message == WM_COMMAND && HIWORD(w_param) == BN_CLICKED) {
     checkbox_->SetChecked(!checkbox_->checked());
     // Fall through to the NativeButtonWin's handler, which will send the
     // clicked notification to the listener...
@@ skipping 61 matching lines @@
   return new NativeCheckboxWin(checkbox);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateRadioButtonWrapper(
     RadioButton* radio_button) {
   return new NativeRadioButtonWin(radio_button);
 }
 
 }  // namespace views
-