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

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

Issue 7329003: Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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/ui/gtk/bookmarks/bookmark_bar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (revision 91772)
+++ chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (working copy)
@@ -392,8 +392,7 @@
GtkWidget* gripper = gtk_button_new();
gtk_widget_set_size_request(gripper, kResizeGripperWidth, -1);
- gtk_widget_set_can_focus(gripper, FALSE);
-
+ GTK_WIDGET_UNSET_FLAGS(gripper, GTK_CAN_FOCUS);
gtk_widget_add_events(gripper, GDK_POINTER_MOTION_MASK);
signals_.Connect(gripper, "motion-notify-event",
G_CALLBACK(OnGripperMotionNotifyThunk), this);
@@ -598,7 +597,7 @@
return;
// Animate the addition if we are showing all browser action buttons.
- if (!gtk_widget_get_visible(overflow_area_)) {
+ if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
AnimateToShowNIcons(button_count());
model_->SetVisibleIconCount(button_count());
}
@@ -615,7 +614,7 @@
RemoveButtonForExtension(extension);
- if (!gtk_widget_get_visible(overflow_area_)) {
+ if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
AnimateToShowNIcons(button_count());
model_->SetVisibleIconCount(button_count());
}
@@ -733,7 +732,7 @@
}
if (button_count() > showing_icon_count) {
- if (!gtk_widget_get_visible(overflow_area_)) {
+ if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
if (drag_button_) {
// During drags, when the overflow chevron shows for the first time,
// take that much space away from |button_hbox_| to make the drag look
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698