Lands http://codereview.chromium.org/172098 for Oshima:

* fix typo in WidgetGtk
* re-organize method in combobox for chrome convention

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/188009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25186 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 5 deletions

diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index 6e44fa701..3075cce 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -98,9 +98,6 @@ gfx::NativeView NativeComboboxGtk::GetTestingHandle() const {
   return native_view();
 }
 
-void NativeComboboxGtk::SelectionChanged() {
-  combobox_->SelectionChanged();
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxGtk, NativeControlGtk overrides:
@@ -128,6 +125,12 @@ void NativeComboboxGtk::NativeControlCreated(GtkWidget* native_control) {
   NativeControlGtk::NativeControlCreated(native_control);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeComboboxGtk, private:
+void NativeComboboxGtk::SelectionChanged() {
+  combobox_->SelectionChanged();
+}
+
 // static
 void NativeComboboxGtk::CallChanged(GtkWidget* widget,
                                     NativeComboboxGtk* combo) {
diff --git a/views/controls/combobox/native_combobox_gtk.h b/views/controls/combobox/native_combobox_gtk.h
index c854367..9e754d2 100644
--- a/views/controls/combobox/native_combobox_gtk.h
+++ b/views/controls/combobox/native_combobox_gtk.h
@@ -33,10 +33,10 @@ class NativeComboboxGtk : public NativeControlGtk,
   virtual void NativeControlCreated(GtkWidget* widget);
 
  private:
-  static void CallChanged(GtkWidget* widget, NativeComboboxGtk* combo);
-
   void SelectionChanged();
 
+  static void CallChanged(GtkWidget* widget, NativeComboboxGtk* combo);
+
   // The combobox we are bound to.
   Combobox* combobox_;