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

Side by Side Diff: chrome/browser/gtk/browser_toolbar_gtk.h

Issue 2996002: GTK: own a widget that was being accessed after destruction. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « no previous file | chrome/browser/gtk/browser_toolbar_gtk.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
6 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_ 6 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 // All the buttons in the toolbar. 223 // All the buttons in the toolbar.
224 scoped_ptr<BackForwardButtonGtk> back_, forward_; 224 scoped_ptr<BackForwardButtonGtk> back_, forward_;
225 scoped_ptr<CustomDrawButton> home_; 225 scoped_ptr<CustomDrawButton> home_;
226 scoped_ptr<ReloadButtonGtk> reload_; 226 scoped_ptr<ReloadButtonGtk> reload_;
227 scoped_ptr<BrowserActionsToolbarGtk> actions_toolbar_; 227 scoped_ptr<BrowserActionsToolbarGtk> actions_toolbar_;
228 OwnedWidgetGtk page_menu_button_, app_menu_button_; 228 OwnedWidgetGtk page_menu_button_, app_menu_button_;
229 229
230 // Keep a pointer to the menu button images because we change them when 230 // Keep a pointer to the menu button images because we change them when
231 // the theme changes. 231 // the theme changes.
232 GtkWidget* page_menu_image_; 232 GtkWidget* page_menu_image_;
233 GtkWidget* app_menu_image_; 233 OwnedWidgetGtk app_menu_image_;
234 234
235 // The model that contains the security level, text, icon to display... 235 // The model that contains the security level, text, icon to display...
236 ToolbarModel* model_; 236 ToolbarModel* model_;
237 237
238 GtkThemeProvider* theme_provider_; 238 GtkThemeProvider* theme_provider_;
239 239
240 scoped_ptr<MenuGtk> page_menu_; 240 scoped_ptr<MenuGtk> page_menu_;
241 scoped_ptr<MenuGtk> app_menu_; 241 scoped_ptr<MenuGtk> app_menu_;
242 242
243 PageMenuModel page_menu_model_; 243 PageMenuModel page_menu_model_;
(...skipping 24 matching lines...) Expand all
268 268
269 ThrobAnimation upgrade_reminder_animation_; 269 ThrobAnimation upgrade_reminder_animation_;
270 270
271 // When collapsed, the toolbar is just a tiny strip, no controls are visible. 271 // When collapsed, the toolbar is just a tiny strip, no controls are visible.
272 bool collapsed_; 272 bool collapsed_;
273 273
274 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk); 274 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
275 }; 275 };
276 276
277 #endif // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_ 277 #endif // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698