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

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

Issue 9371005: GTK: Do more GSEALing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/slide_animator_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/find_bar_gtk.cc
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index e2672efb875580d2b91e9802f7b36d3186f58db4..1137f36571a617c4d210a10eaa453a7193aee09c 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -326,8 +326,9 @@ void FindBarGtk::Show(bool animate) {
slide_widget_->Open();
selection_rect_ = gfx::Rect();
Reposition();
- if (container_->window)
- gdk_window_raise(container_->window);
+ GdkWindow* gdk_window = gtk_widget_get_window(container_);
+ if (gdk_window)
+ gdk_window_raise(gdk_window);
} else {
slide_widget_->OpenWithoutAnimation();
}
@@ -640,8 +641,9 @@ void FindBarGtk::Reposition() {
return;
// This will trigger an allocate, which allows us to reposition.
- if (widget()->parent)
- gtk_widget_queue_resize(widget()->parent);
+ GtkWidget* parent = gtk_widget_get_parent(widget());
+ if (parent)
+ gtk_widget_queue_resize(parent);
}
void FindBarGtk::StoreOutsideFocus() {
@@ -718,13 +720,15 @@ void FindBarGtk::AdjustTextAlignment() {
gfx::Point FindBarGtk::GetPosition() {
gfx::Point point;
+ GtkWidget* parent = gtk_widget_get_parent(widget());
+
GValue value = { 0, };
g_value_init(&value, G_TYPE_INT);
- gtk_container_child_get_property(GTK_CONTAINER(widget()->parent),
+ gtk_container_child_get_property(GTK_CONTAINER(parent),
widget(), "x", &value);
point.set_x(g_value_get_int(&value));
- gtk_container_child_get_property(GTK_CONTAINER(widget()->parent),
+ gtk_container_child_get_property(GTK_CONTAINER(parent),
widget(), "y", &value);
point.set_y(g_value_get_int(&value));
@@ -736,7 +740,7 @@ gfx::Point FindBarGtk::GetPosition() {
// static
void FindBarGtk::OnParentSet(GtkWidget* widget, GtkObject* old_parent,
FindBarGtk* find_bar) {
- if (!widget->parent)
+ if (!gtk_widget_get_parent(widget))
return;
g_signal_connect(gtk_widget_get_parent(widget), "set-floating-position",
@@ -888,7 +892,7 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
bar->container_height_ = allocation.height;
}
- cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
+ cairo_t* cr = gdk_cairo_create(gtk_widget_get_window(widget));
gdk_cairo_rectangle(cr, &e->area);
cairo_clip(cr);
@@ -902,7 +906,8 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
// now instead of when we render |border_bin_|. We don't use stacked event
// boxes to simulate the effect because we need to blend them with this
// background.
- GtkAllocation border_allocation = bar->border_bin_->allocation;
+ GtkAllocation border_allocation;
+ gtk_widget_get_allocation(bar->border_bin_, &border_allocation);
// Blit the left part of the background image once on the left.
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc ('k') | chrome/browser/ui/gtk/slide_animator_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698