Modified the toolbar button handlers so that the handlers can revert the locati...

chrome/browser/gtk/browser_toolbar_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 "chrome/browser/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/l10n_util.h"
@@ skipping 154 matching lines @@
   // we still hold on to the original, and thus own a reference to the group.
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(top_level_window, accel_group_);
 
   // Group back and forward into an hbox so there's no spacing between them.
   GtkWidget* back_forward_hbox_ = gtk_hbox_new(FALSE, 0);
 
   back_.reset(new BackForwardButtonGtk(browser_, false));
   gtk_box_pack_start(GTK_BOX(back_forward_hbox_), back_->widget(), FALSE,
                      FALSE, 0);
+  g_signal_connect(back_->widget(), "clicked",
+                   G_CALLBACK(OnButtonClick), this);
 
   forward_.reset(new BackForwardButtonGtk(browser_, true));
   gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE,
                      FALSE, 0);
+  g_signal_connect(forward_->widget(), "clicked",
+                   G_CALLBACK(OnButtonClick), this);
   gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0);
 
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
       l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD),
       GTK_STOCK_REFRESH));
 
   home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                                  l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME),
                                  GTK_STOCK_HOME));
   gtk_util::SetButtonTriggersNavigation(home_->widget());
@@ skipping 419 matching lines @@
 
     g_object_unref(our_style);
   }
 
   return FALSE;
 }
 
 // static
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button,
                                       BrowserToolbarGtk* toolbar) {
+  if ((button == toolbar->back_->widget()) ||
+      (button == toolbar->forward_->widget())) {
+    toolbar->location_bar_->Revert();
+    return;
+  }
+
   int tag = -1;
-  if (button == toolbar->reload_->widget())
+  if (button == toolbar->reload_->widget()) {
     tag = IDC_RELOAD;
-  else if (toolbar->home_.get() && button == toolbar->home_->widget())
+    toolbar->location_bar_->Revert();
+  } else if (toolbar->home_.get() && button == toolbar->home_->widget()) {
     tag = IDC_HOME;
-  else if (button == toolbar->star_->widget())
+  } else if (button == toolbar->star_->widget()) {
     tag = IDC_STAR;
+  }
 
   DCHECK_NE(tag, -1) << "Unexpected button click callback";
   toolbar->browser_->ExecuteCommandWithDisposition(tag,
       event_utils::DispositionFromEventFlags(
           toolbar->last_release_event_flags_));
 }
 
 // static
 gboolean BrowserToolbarGtk::OnButtonRelease(GtkWidget* button,
                                             GdkEventButton* event,
@@ skipping 84 matching lines @@
       g_signal_stop_emission_by_name(menu, "move-current");
     default:
       break;
   }
 }
 
 bool BrowserToolbarGtk::ShouldOnlyShowLocation() const {
   // If we're a popup window, only show the location bar (omnibox).
   return browser_->type() != Browser::TYPE_NORMAL;
 }