diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.h | 8 | ||||
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_renderer_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 22cf7d42..59537cb 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -359,10 +359,10 @@ gboolean BookmarkBarGtk::OnToolbarDragMotion(GtkToolbar* toolbar, } // static -gboolean BookmarkBarGtk::OnToolbarDragLeave(GtkToolbar* toolbar, - GdkDragContext* context, - guint time, - BookmarkBarGtk* bar) { +void BookmarkBarGtk::OnToolbarDragLeave(GtkToolbar* toolbar, + GdkDragContext* context, + guint time, + BookmarkBarGtk* bar) { if (bar->toolbar_drop_item_) { g_object_unref(bar->toolbar_drop_item_); bar->toolbar_drop_item_ = NULL; diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index 1c151f5..9b1a30f 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -139,10 +139,10 @@ class BookmarkBarGtk : public BookmarkModelObserver { gint y, guint time, BookmarkBarGtk* bar); - static gboolean OnToolbarDragLeave(GtkToolbar* toolbar, - GdkDragContext* context, - guint time, - BookmarkBarGtk* bar); + static void OnToolbarDragLeave(GtkToolbar* toolbar, + GdkDragContext* context, + guint time, + BookmarkBarGtk* bar); Profile* profile_; diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 4811f77..13aa8f8 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -143,8 +143,8 @@ TabRendererGtk::TabRendererGtk() fav_icon_hiding_offset_(0), should_display_crashed_favicon_(false), hovering_(false), - loading_animation_(&loading_animation_data), - close_button_state_(BS_NORMAL) { + close_button_state_(BS_NORMAL), + loading_animation_(&loading_animation_data) { InitResources(); } diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index f697099..45f1839 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -148,9 +148,8 @@ class NewTabButton { // Creates a clickable region of the button's visual representation. Used for // hit-testing. Caller is responsible for destroying the region. GdkRegion* MakeRegionForButton() const { - int w = width(); - int h = height(); - static const int kNumRegionPoints = 8; + const int w = width(); + const int kNumRegionPoints = 8; // These values are defined by the shape of the new tab bitmap. Should that // bitmap ever change, these values will need to be updated. They're so |