Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.cc

Issue 131071: Implement window open disposition for (some) navigation buttons.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: bool->int Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.h ('k') | chrome/common/gtk_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_toolbar_gtk.cc
===================================================================
--- chrome/browser/gtk/browser_toolbar_gtk.cc (revision 18718)
+++ chrome/browser/gtk/browser_toolbar_gtk.cc (working copy)
@@ -26,6 +26,7 @@
#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/gtk_util.h"
#include "chrome/common/notification_details.h"
#include "chrome/common/notification_type.h"
#include "chrome/common/pref_names.h"
@@ -63,7 +64,8 @@
model_(browser->toolbar_model()),
browser_(browser),
window_(window),
- profile_(NULL) {
+ profile_(NULL),
+ last_release_event_flags_(0) {
browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
@@ -130,6 +132,7 @@
home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME)));
+ gtk_util::SetButtonTriggersNavigation(home_->widget());
// Group the start, omnibox, and go button into an hbox.
GtkWidget* omnibox_hbox_ = gtk_hbox_new(FALSE, 0);
@@ -305,6 +308,8 @@
localized_tooltip.c_str());
g_signal_connect(button->widget(), "clicked",
G_CALLBACK(OnButtonClick), this);
+ g_signal_connect(button->widget(), "button-release-event",
+ G_CALLBACK(OnButtonRelease), this);
gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
return button;
@@ -373,11 +378,21 @@
else if (button == toolbar->star_->widget())
tag = IDC_STAR;
- DCHECK_NE(tag, -1) << "Impossible button click callback";
- toolbar->browser_->ExecuteCommand(tag);
+ 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,
+ BrowserToolbarGtk* toolbar) {
+ toolbar->last_release_event_flags_ = event->state;
+ return FALSE;
+}
+
+// static
gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button,
GdkEventButton* event,
BrowserToolbarGtk* toolbar) {
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.h ('k') | chrome/common/gtk_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698