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

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

Issue 8625001: GTK: Part 1 of removing GtkWidget->window to close up GSEALs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Ignore chromeos Created 9 years, 1 month 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/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_window_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_titlebar.cc
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index b15cd62a470885a3f757c2144dfd6680abcd2f3e..033df670951a822464a63f0bb065453273f16436 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -836,7 +836,8 @@ void BrowserTitlebar::MaximizeButtonClicked() {
} else {
GtkWidget* widget = GTK_WIDGET(window_);
GdkScreen* screen = gtk_widget_get_screen(widget);
- gint monitor = gdk_screen_get_monitor_at_window(screen, widget->window);
+ gint monitor = gdk_screen_get_monitor_at_window(
+ screen, gtk_widget_get_window(widget));
GdkRectangle screen_rect;
gdk_screen_get_monitor_geometry(screen, monitor, &screen_rect);
@@ -1042,7 +1043,8 @@ void BrowserTitlebar::ActiveWindowChanged(GdkWindow* active_window) {
if (!window_)
return;
- window_has_focus_ = GTK_WIDGET(window_)->window == active_window;
+ window_has_focus_ =
+ gtk_widget_get_window(GTK_WIDGET(window_)) == active_window;
if (IsTypePanel()) {
if (window_has_focus_ || window_has_mouse_)
gtk_widget_show(panel_wrench_button_->widget());
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698