Re-land r51526

views/controls/button/native_button_win.cc

 // Copyright (c) 2010 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/button/native_button_win.h"
 
 #include <commctrl.h>
 
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, public:
 
 NativeButtonWin::NativeButtonWin(NativeButton* native_button)
-    : native_button_(native_button) {
+    : native_button_(native_button),
+      button_size_valid_(false) {
   // 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).
   set_focus_view(native_button);
 }
 
 NativeButtonWin::~NativeButtonWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, NativeButtonWrapper implementation:
 
 void NativeButtonWin::UpdateLabel() {
   // Show or hide the shield icon of Windows onto this button every time when we
   // update the button text so Windows can lay out the shield icon and the
   // button text correctly.
   if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
       win_util::UserAccountControlIsEnabled()) {
     Button_SetElevationRequiredState(native_view(),
                                      native_button_->need_elevation());
   }
 
   SetWindowText(native_view(), native_button_->label().c_str());
+  button_size_valid_ = false;
 }
 
 void NativeButtonWin::UpdateFont() {
   SendMessage(native_view(), WM_SETFONT,
               reinterpret_cast<WPARAM>(native_button_->font().hfont()),
               FALSE);
+  button_size_valid_ = false;
 }
 
 void NativeButtonWin::UpdateEnabled() {
   SetEnabled(native_button_->IsEnabled());
 }
 
 void NativeButtonWin::UpdateDefault() {
   if (!IsCheckbox()) {
     SendMessage(native_view(), BM_SETSTYLE,
                 native_button_->is_default() ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON,
                 true);
+    button_size_valid_ = false;
   }
 }
 
 View* NativeButtonWin::GetView() {
   return this;
 }
 
 void NativeButtonWin::SetFocus() {
   // Focus the associated HWND.
   Focus();
 }
 
 bool NativeButtonWin::UsesNativeLabel() const {
   return true;
 }
 
 bool NativeButtonWin::UsesNativeRadioButtonGroup() const {
   return false;
 }
 
 gfx::NativeView NativeButtonWin::GetTestingHandle() const {
   return native_view();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, View overrides:
 
 gfx::Size NativeButtonWin::GetPreferredSize() {
-  SIZE sz = {0};
-  SendMessage(native_view(), BCM_GETIDEALSIZE, 0, reinterpret_cast<LPARAM>(&sz));
-
-  return gfx::Size(sz.cx, sz.cy);
+  if (!button_size_valid_) {
+    SIZE sz = {0};
+    Button_GetIdealSize(native_view(), reinterpret_cast<LPARAM>(&sz));
+    button_size_.SetSize(sz.cx, sz.cy);
+    button_size_valid_ = true;
+  }
+  return button_size_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, NativeControlWin overrides:
 
 bool NativeButtonWin::ProcessMessage(UINT message, WPARAM w_param,
                                      LPARAM l_param, LRESULT* result) {
   if (message == WM_COMMAND && HIWORD(w_param) == BN_CLICKED) {
     native_button_->ButtonPressed();
     *result = 0;
@@ skipping 143 matching lines @@
   return new NativeCheckboxWin(checkbox);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateRadioButtonWrapper(
     RadioButton* radio_button) {
   return new NativeRadioButtonWin(radio_button);
 }
 
 }  // namespace views