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

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

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
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 "ui/views/widget/native_widget_gtk.h" 5 #include "ui/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 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 close_widget_factory_.GetWeakPtr())); 1133 close_widget_factory_.GetWeakPtr()));
1134 } 1134 }
1135 } 1135 }
1136 1136
1137 void NativeWidgetGtk::CloseNow() { 1137 void NativeWidgetGtk::CloseNow() {
1138 if (widget_) { 1138 if (widget_) {
1139 gtk_widget_destroy(widget_); // Triggers OnDestroy(). 1139 gtk_widget_destroy(widget_); // Triggers OnDestroy().
1140 } 1140 }
1141 } 1141 }
1142 1142
1143 void NativeWidgetGtk::EnableClose(bool enable) {
1144 gtk_window_set_deletable(GetNativeWindow(), enable);
1145 }
1146
1143 void NativeWidgetGtk::Show() { 1147 void NativeWidgetGtk::Show() {
1144 if (widget_) { 1148 if (widget_) {
1145 gtk_widget_show(widget_); 1149 gtk_widget_show(widget_);
1146 if (widget_->window) 1150 if (widget_->window)
1147 gdk_window_raise(widget_->window); 1151 gdk_window_raise(widget_->window);
1148 } 1152 }
1149 } 1153 }
1150 1154
1151 void NativeWidgetGtk::Hide() { 1155 void NativeWidgetGtk::Hide() {
1152 if (widget_) { 1156 if (widget_) {
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
2221 button_pressed = event->type == GDK_BUTTON_PRESS || 2225 button_pressed = event->type == GDK_BUTTON_PRESS ||
2222 event->type == GDK_2BUTTON_PRESS || 2226 event->type == GDK_2BUTTON_PRESS ||
2223 event->type == GDK_3BUTTON_PRESS; 2227 event->type == GDK_3BUTTON_PRESS;
2224 gdk_event_free(event); 2228 gdk_event_free(event);
2225 } 2229 }
2226 return button_pressed; 2230 return button_pressed;
2227 } 2231 }
2228 2232
2229 } // namespace internal 2233 } // namespace internal
2230 } // namespace views 2234 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698