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

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"
@@ skipping 39 matching lines @@
 
 void NativeButtonGtk::UpdateEnabled() {
   if (!native_view())
     return;
   SetEnabled(native_button_->IsEnabled());
 }
 
 void NativeButtonGtk::UpdateDefault() {
   if (!native_view())
     return;
-  if (!IsCheckbox())
+  if (IsCheckbox())
+    UpdateChecked();
+  else
     NOTIMPLEMENTED();
 }
 
 View* NativeButtonGtk::GetView() {
   return this;
 }
 
 void NativeButtonGtk::SetFocus() {
   // Focus the associated widget.
   Focus();
@@ skipping 37 matching lines @@
 
 // static
 void NativeButtonGtk::CallClicked(GtkButton* widget, NativeButtonGtk* button) {
   button->OnClicked();
 }
 
 void NativeButtonGtk::OnClicked() {
   native_button_->ButtonPressed();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeCheckboxGtk
 NativeCheckboxGtk::NativeCheckboxGtk(Checkbox* checkbox)
-    : NativeButtonGtk(checkbox) {
+    : NativeButtonGtk(checkbox),
+      checkbox_(checkbox),
+      deliver_click_event_(true) {
 }
 
 void NativeCheckboxGtk::CreateNativeControl() {
   GtkWidget* widget = gtk_check_button_new();
+  g_signal_connect(G_OBJECT(widget), "clicked",
+                   G_CALLBACK(CallClicked), this);
   NativeControlCreated(widget);
 }
 
+void NativeCheckboxGtk::OnClicked() {
+  // ignore event if the event is generated by
+  // gtk_toggle_button_set_active below.
+  if (deliver_click_event_) {
+    checkbox_->SetChecked(!checkbox_->checked());
+    NativeButtonGtk::OnClicked();
+  }
+}
+
+void NativeCheckboxGtk::UpdateChecked() {
+  if (!native_view())
+    return;
+  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(native_view()))
+      != checkbox_->checked()) {
+    // gtk_toggle_button_set_active emites "clicked" signal, which
+    // invokes OnClicked method above. deliver_click_event_ flag is used
+    // to prevent such signal to invoke OnClicked callback.
+    deliver_click_event_ = false;
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(native_view()),
+                                 checkbox_->checked());
+    deliver_click_event_ = true;
+  }
+}
+
+// static
+void NativeCheckboxGtk::CallClicked(GtkButton* widget,
+                                    NativeCheckboxGtk* button) {
+  button->OnClicked();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NativeButtonWrapper
+
 // static
 int NativeButtonWrapper::GetFixedWidth() {
   // TODO(brettw) implement this properly.
   return 10;
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateNativeButtonWrapper(
     NativeButton* native_button) {
   return new NativeButtonGtk(native_button);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateCheckboxWrapper(
     Checkbox* checkbox) {
   return new NativeCheckboxGtk(checkbox);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateRadioButtonWrapper(
     RadioButton* radio_button) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 }  // namespace views