Fix for native button focus bug

chrome/views/controls/button/native_button_win.cc

Index: chrome/views/controls/button/native_button_win.cc
===================================================================
--- chrome/views/controls/button/native_button_win.cc	(revision 12376)
+++ chrome/views/controls/button/native_button_win.cc	(working copy)
@@ -18,6 +18,10 @@
 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() {
@@ -48,6 +52,11 @@
   return this;
 }
 
+void NativeButtonWin::SetFocus() {
+  // Focus the associated HWND.
+  Focus();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, View overrides:
 
@@ -135,6 +144,11 @@
   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:
 
@@ -216,4 +230,3 @@
 }
 
 }  // namespace views
-