Implement stop/go button for Linux

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 "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/back_forward_menu_model_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
+#include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ skipping 88 matching lines @@
   if (*show_home_button_)
     home_.reset(MakeHomeButton());
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new("  "), FALSE, FALSE, 0);
 
   star_.reset(BuildStarButton(l10n_util::GetString(IDS_TOOLTIP_STAR)));
 
   location_bar_->Init();
   gtk_box_pack_start(GTK_BOX(toolbar_), location_bar_->widget(), TRUE, TRUE, 0);
 
-  go_.reset(BuildToolbarButton(IDR_GO, IDR_GO_P, IDR_GO_H, 0, L""));
+  go_.reset(new GoButtonGtk(browser_));
+  gtk_box_pack_start(GTK_BOX(toolbar_), go_->widget(), FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
 
   page_menu_button_.reset(BuildToolbarMenuButton(IDR_MENU_PAGE,
       l10n_util::GetString(IDS_PAGEMENU_TOOLTIP)));
   page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_));
 
   app_menu_button_.reset(BuildToolbarMenuButton(IDR_MENU_CHROME,
       l10n_util::GetStringF(IDS_APPMENU_TOOLTIP,
                             l10n_util::GetString(IDS_PRODUCT_NAME))));
@@ skipping 143 matching lines @@
 // static
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button,
                                       BrowserToolbarGtk* toolbar) {
   int tag = -1;
   if (button == toolbar->back_->widget())
     tag = IDC_BACK;
   else if (button == toolbar->forward_->widget())
     tag = IDC_FORWARD;
   else if (button == toolbar->reload_->widget())
     tag = IDC_RELOAD;
-  else if (button == toolbar->go_->widget())
-    tag = IDC_GO;
   else if (toolbar->home_.get() && button == toolbar->home_->widget())
     tag = IDC_HOME;
   else if (button == toolbar->star_->widget())
     tag = IDC_STAR;
 
   if (tag == IDC_BACK || tag == IDC_FORWARD)
     toolbar->show_menu_factory_.RevokeAll();
 
-  DCHECK(tag != -1) << "Impossible button click callback";
+  DCHECK_NE(tag, -1) << "Impossible button click callback";
   toolbar->browser_->ExecuteCommand(tag);
 }
 
 // static
 gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button,
                                                    GdkEvent* event,
                                                    BrowserToolbarGtk* toolbar) {
   // TODO(port): this never puts the button into the "active" state,
   // which means we never display the button-pressed-down graphics.  I
   // suspect a better way to do it is just to use a real GtkMenuShell
@@ skipping 96 matching lines @@
     rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER),
     rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE),
     NULL,
     rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE),
     rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER),
     rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER),
     rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER)
   };
   background_ninebox_.reset(new NineBox(images));
 }