diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 06:40:57 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 06:40:57 +0000 |
| commit | 64f001a8a74f5d861d9948155c92419f53928e50 (patch) | |
| tree | 4f215495257c68c34f8f1bbc4724e35a73be1788 /chrome/browser/gtk/browser_toolbar_gtk.cc | |
| parent | 253071feeaf010115a8fbe498d1ebd634c2d1626 (diff) | |
| download | chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.zip chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.tar.gz chromium_src-64f001a8a74f5d861d9948155c92419f53928e50.tar.bz2 | |
Implement stop/go button for Linux.
Refactored code out of CustomDrawButton into CustomDrawButtonBase to be shared with GoButtonGtk.
Replaced the existing non-togglable go button with GoButtonGtk.
Note that tooltip support isn't done yet, as it changes based on the state of the location bar and the go/stop state.
Add a simple test.
Fix some minor lint errors.
BUG=9381
Review URL: http://codereview.chromium.org/62154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_toolbar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 37cbd5d..8455157 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -13,6 +13,7 @@ #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" @@ -121,7 +122,8 @@ void BrowserToolbarGtk::Init(Profile* profile, 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); @@ -285,8 +287,6 @@ void BrowserToolbarGtk::OnButtonClick(GtkWidget* button, 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()) @@ -295,7 +295,7 @@ void BrowserToolbarGtk::OnButtonClick(GtkWidget* button, 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); } |