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

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

Issue 10546116: gtk: Extract event functions into event_utils module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
Index: chrome/browser/ui/gtk/browser_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index 235109623eb1817557165fa7549ac3a17f70d49e..4e0aac789a2ba25cdb2c8bec2ac227317f15b186 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
-#include <X11/XF86keysym.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
+#include <X11/XF86keysym.h>
#include "base/base_paths.h"
#include "base/command_line.h"
@@ -29,6 +29,7 @@
#include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
#include "chrome/browser/ui/gtk/browser_window_gtk.h"
#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/event_utils.h"
#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
@@ -594,14 +595,14 @@ gboolean BrowserToolbarGtk::OnLocationHboxExpose(GtkWidget* location_hbox,
void BrowserToolbarGtk::OnButtonClick(GtkWidget* button) {
if ((button == back_->widget()) || (button == forward_->widget())) {
- if (gtk_util::DispositionForCurrentButtonPressEvent() == CURRENT_TAB)
+ if (event_utils::DispositionForCurrentButtonPressEvent() == CURRENT_TAB)
location_bar_->Revert();
return;
}
DCHECK(home_.get() && button == home_->widget()) <<
"Unexpected button click callback";
- browser_->Home(gtk_util::DispositionForCurrentButtonPressEvent());
+ browser_->Home(event_utils::DispositionForCurrentButtonPressEvent());
}
gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button,
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc ('k') | chrome/browser/ui/gtk/event_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698