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

Side by Side Diff: views/widget/native_widget_gtk.cc

Issue 8620002: s/Move/Stack/ in names of stacking-related methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a test 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/widget/native_widget_gtk.h ('k') | views/widget/native_widget_private.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/widget/native_widget_gtk.h" 5 #include "views/widget/native_widget_gtk.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/shape.h> 9 #include <X11/extensions/shape.h>
10 #include <gdk/gdk.h> 10 #include <gdk/gdk.h>
(...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 } 1136 }
1137 } else { 1137 } else {
1138 if (GTK_WIDGET_MAPPED(widget_)) 1138 if (GTK_WIDGET_MAPPED(widget_))
1139 gdk_window_resize(widget_->window, size.width(), size.height()); 1139 gdk_window_resize(widget_->window, size.width(), size.height());
1140 GtkWindow* gtk_window = GTK_WINDOW(widget_); 1140 GtkWindow* gtk_window = GTK_WINDOW(widget_);
1141 if (!size.IsEmpty()) 1141 if (!size.IsEmpty())
1142 gtk_window_resize(gtk_window, size.width(), size.height()); 1142 gtk_window_resize(gtk_window, size.width(), size.height());
1143 } 1143 }
1144 } 1144 }
1145 1145
1146 void NativeWidgetGtk::MoveAbove(gfx::NativeView native_view) { 1146 void NativeWidgetGtk::StackAbove(gfx::NativeView native_view) {
1147 ui::StackPopupWindow(GetNativeView(), native_view); 1147 ui::StackPopupWindow(GetNativeView(), native_view);
1148 } 1148 }
1149 1149
1150 void NativeWidgetGtk::MoveToTop() { 1150 void NativeWidgetGtk::StackAtTop() {
1151 DCHECK(GTK_IS_WINDOW(GetNativeView())); 1151 DCHECK(GTK_IS_WINDOW(GetNativeView()));
1152 gtk_window_present(GTK_WINDOW(GetNativeView())); 1152 gtk_window_present(GTK_WINDOW(GetNativeView()));
1153 } 1153 }
1154 1154
1155 void NativeWidgetGtk::SetShape(gfx::NativeRegion region) { 1155 void NativeWidgetGtk::SetShape(gfx::NativeRegion region) {
1156 if (widget_ && widget_->window) { 1156 if (widget_ && widget_->window) {
1157 gdk_window_shape_combine_region(widget_->window, region, 0, 0); 1157 gdk_window_shape_combine_region(widget_->window, region, 0, 0);
1158 gdk_region_destroy(region); 1158 gdk_region_destroy(region);
1159 } 1159 }
1160 } 1160 }
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2303 button_pressed = event->type == GDK_BUTTON_PRESS || 2303 button_pressed = event->type == GDK_BUTTON_PRESS ||
2304 event->type == GDK_2BUTTON_PRESS || 2304 event->type == GDK_2BUTTON_PRESS ||
2305 event->type == GDK_3BUTTON_PRESS; 2305 event->type == GDK_3BUTTON_PRESS;
2306 gdk_event_free(event); 2306 gdk_event_free(event);
2307 } 2307 }
2308 return button_pressed; 2308 return button_pressed;
2309 } 2309 }
2310 2310
2311 } // namespace internal 2311 } // namespace internal
2312 } // namespace views 2312 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/native_widget_gtk.h ('k') | views/widget/native_widget_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698