Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

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 "views/controls/button/native_button_win.h"
 
 #include <commctrl.h>
 
 #include "base/logging.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)
     : 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);
+  set_focus_view(native_button);
 }
 
 NativeButtonWin::~NativeButtonWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, NativeButtonWrapper implementation:
 
 void NativeButtonWin::UpdateLabel() {
-  SetWindowText(GetHWND(), native_button_->label().c_str());
+  SetWindowText(native_view(), native_button_->label().c_str());
 }
 
 void NativeButtonWin::UpdateFont() {
-  SendMessage(GetHWND(), WM_SETFONT,
+  SendMessage(native_view(), WM_SETFONT,
               reinterpret_cast<WPARAM>(native_button_->font().hfont()),
               FALSE);
 }
 
 void NativeButtonWin::UpdateEnabled() {
   SetEnabled(native_button_->IsEnabled());
 }
 
 void NativeButtonWin::UpdateDefault() {
   if (!IsCheckbox()) {
-    SendMessage(GetHWND(), BM_SETSTYLE,
+    SendMessage(native_view(), 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));
+  SendMessage(native_view(), BCM_GETIDEALSIZE, 0, reinterpret_cast<LPARAM>(&sz));
 
   return gfx::Size(sz.cx, sz.cy);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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) {
@@ skipping 53 matching lines @@
 // NativeCheckboxWin, View overrides:
 
 gfx::Size NativeCheckboxWin::GetPreferredSize() {
   return gfx::Size(kCheckboxSize, kCheckboxSize);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeCheckboxWin, NativeButtonWrapper implementation:
 
 void NativeCheckboxWin::UpdateChecked() {
-  SendMessage(GetHWND(), BM_SETCHECK,
+  SendMessage(native_view(), BM_SETCHECK,
               checkbox_->checked() ? BST_CHECKED : BST_UNCHECKED, 0);
 }
 
 void NativeCheckboxWin::SetPushed(bool pushed) {
-  SendMessage(GetHWND(), BM_SETSTATE, pushed, 0);
+  SendMessage(native_view(), BM_SETSTATE, pushed, 0);
 }
 
 bool NativeCheckboxWin::OnKeyDown(int vkey) {
   // Override the NativeButtonWin behavior which triggers the button on enter
   // key presses when focused.
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeCheckboxWin, NativeButtonWin overrides:
@@ skipping 66 matching lines @@
   return new NativeCheckboxWin(checkbox);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateRadioButtonWrapper(
     RadioButton* radio_button) {
   return new NativeRadioButtonWin(radio_button);
 }
 
 }  // namespace views