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

views/controls/button/native_button_gtk.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 <gtk/gtk.h>
 
 #include "views/controls/button/native_button_gtk.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
+#include "views/controls/native/native_view_host_gtk.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 NativeButtonGtk::NativeButtonGtk(NativeButton* native_button)
     : NativeControlGtk(),
       native_button_(native_button) {
   // Associates the actual GtkWidget with the native_button so the native_button
   // is the one considered as having the focus (not the wrapper) when the
   // GtkWidget is focused directly (with a click for example).
-  SetAssociatedFocusView(native_button);
+  set_focus_view(native_button);
 }
 
 NativeButtonGtk::~NativeButtonGtk() {
 }
 
 void NativeButtonGtk::UpdateLabel() {
   if (!native_view())
     return;
 
   gtk_button_set_label(GTK_BUTTON(native_view()),
@@ skipping 48 matching lines @@
 void NativeButtonGtk::NativeControlCreated(GtkWidget* widget) {
   NativeControlGtk::NativeControlCreated(widget);
 
   UpdateFont();
   UpdateLabel();
   UpdateDefault();
 }
 
 // static
 void NativeButtonGtk::CallClicked(GtkButton* widget) {
-  View* view = GetViewForNative(GTK_WIDGET(widget));
+  View* view = NativeViewHostGtk::GetViewForNative(GTK_WIDGET(widget));
   if (view)
     static_cast<NativeButtonGtk*>(view)->OnClicked();
 }
 
 void NativeButtonGtk::OnClicked() {
   native_button_->ButtonPressed();
 }
 
 NativeCheckboxGtk::NativeCheckboxGtk(Checkbox* checkbox)
     : NativeButtonGtk(checkbox) {
@@ skipping 16 matching lines @@
   return new NativeButtonGtk(native_button);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateCheckboxWrapper(
     Checkbox* checkbox) {
   return new NativeCheckboxGtk(checkbox);
 }
 
 }  // namespace views