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

Side by Side Diff: views/widget/widget_gtk.h

Issue 150137: Fixes crash in ~WidgetGtk. This was caused by your change to no longer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | views/widget/widget_win.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef VIEWS_WIDGET_WIDGET_GTK_H_ 5 #ifndef VIEWS_WIDGET_WIDGET_GTK_H_
6 #define VIEWS_WIDGET_WIDGET_GTK_H_ 6 #define VIEWS_WIDGET_WIDGET_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // window_contents_ is a GtkFixed. If we're not a window/popup, then widget_ 202 // window_contents_ is a GtkFixed. If we're not a window/popup, then widget_
203 // and window_contents_ point to the same GtkFixed. 203 // and window_contents_ point to the same GtkFixed.
204 GtkWidget* widget_; 204 GtkWidget* widget_;
205 GtkWidget* window_contents_; 205 GtkWidget* window_contents_;
206 206
207 // Child GtkWidgets created with no parent need to be parented to a valid top 207 // Child GtkWidgets created with no parent need to be parented to a valid top
208 // level window otherwise Gtk throws a fit. |null_parent_| is an invisible 208 // level window otherwise Gtk throws a fit. |null_parent_| is an invisible
209 // popup that such GtkWidgets are parented to. 209 // popup that such GtkWidgets are parented to.
210 static GtkWidget* null_parent_; 210 static GtkWidget* null_parent_;
211 211
212 // The TooltipManager.
213 // WARNING: RootView's destructor calls into the TooltipManager. As such, this
214 // must be destroyed AFTER root_view_.
215 scoped_ptr<TooltipManagerGtk> tooltip_manager_;
216
212 // The root of the View hierarchy attached to this window. 217 // The root of the View hierarchy attached to this window.
213 scoped_ptr<RootView> root_view_; 218 scoped_ptr<RootView> root_view_;
214 219
215 scoped_ptr<TooltipManagerGtk> tooltip_manager_;
216
217 // If true, the mouse is currently down. 220 // If true, the mouse is currently down.
218 bool is_mouse_down_; 221 bool is_mouse_down_;
219 222
220 // Have we done a mouse grab? 223 // Have we done a mouse grab?
221 bool has_capture_; 224 bool has_capture_;
222 225
223 // The following are used to detect duplicate mouse move events and not 226 // The following are used to detect duplicate mouse move events and not
224 // deliver them. Displaying a window may result in the system generating 227 // deliver them. Displaying a window may result in the system generating
225 // duplicate move events even though the mouse hasn't moved. 228 // duplicate move events even though the mouse hasn't moved.
226 229
(...skipping 14 matching lines...) Expand all
241 bool transparent_; 244 bool transparent_;
242 245
243 scoped_ptr<DefaultThemeProvider> default_theme_provider_; 246 scoped_ptr<DefaultThemeProvider> default_theme_provider_;
244 247
245 DISALLOW_COPY_AND_ASSIGN(WidgetGtk); 248 DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
246 }; 249 };
247 250
248 } // namespace views 251 } // namespace views
249 252
250 #endif // VIEWS_WIDGET_WIDGET_GTK_H_ 253 #endif // VIEWS_WIDGET_WIDGET_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | views/widget/widget_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698