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

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

Issue 43135: Fix some browser shutdown issues on Linux. (Closed)
Patch Set: Patch against other branch Created 11 years, 9 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
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 CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
6 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/gfx/rect.h" 10 #include "base/gfx/rect.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Must be called once at startup. 94 // Must be called once at startup.
95 // Triggers relayout of the content. 95 // Triggers relayout of the content.
96 void SetCustomFrame(bool custom_frame); 96 void SetCustomFrame(bool custom_frame);
97 97
98 // Callback for when the "content area" vbox needs to be redrawn. 98 // Callback for when the "content area" vbox needs to be redrawn.
99 // The content area includes the toolbar and web page but not the tab strip. 99 // The content area includes the toolbar and web page but not the tab strip.
100 // It has a soft gray border when we have a custom frame. 100 // It has a soft gray border when we have a custom frame.
101 static gboolean OnContentAreaExpose(GtkWidget* widget, GdkEventExpose* e, 101 static gboolean OnContentAreaExpose(GtkWidget* widget, GdkEventExpose* e,
102 BrowserWindowGtk* window); 102 BrowserWindowGtk* window);
103 103
104 static gboolean OnWindowDestroyed(GtkWidget* window,
105 BrowserWindowGtk* browser_win);
104 gfx::Rect bounds_; 106 gfx::Rect bounds_;
105 GdkWindowState state_; 107 GdkWindowState state_;
106 108
107 // Theme graphics for the content area. 109 // Theme graphics for the content area.
108 scoped_ptr<NineBox> content_area_ninebox_; 110 scoped_ptr<NineBox> content_area_ninebox_;
109 111
110 // Whether we're drawing the custom Chrome frame (including title bar). 112 // Whether we're drawing the custom Chrome frame (including title bar).
111 bool custom_frame_; 113 bool custom_frame_;
112 114
113 // The object that manages all of the widgets in the toolbar. 115 // The object that manages all of the widgets in the toolbar.
114 scoped_ptr<BrowserToolbarGtk> toolbar_; 116 scoped_ptr<BrowserToolbarGtk> toolbar_;
115 117
116 // The status bubble manager. Always non-NULL. 118 // The status bubble manager. Always non-NULL.
117 scoped_ptr<StatusBubbleGtk> status_bubble_; 119 scoped_ptr<StatusBubbleGtk> status_bubble_;
118 120
119 // A container that manages the GtkWidget*s that are the webpage display 121 // A container that manages the GtkWidget*s that are the webpage display
120 // (along with associated infobars, shelves, and other things that are part 122 // (along with associated infobars, shelves, and other things that are part
121 // of the content area). 123 // of the content area).
122 scoped_ptr<TabContentsContainerGtk> contents_container_; 124 scoped_ptr<TabContentsContainerGtk> contents_container_;
123 125
124 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 126 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
125 // non-NULL, it may or may not be visible. It is possible for the Find Bar 127 // non-NULL, it may or may not be visible. It is possible for the Find Bar
126 // to move among windows as tabs are dragged around. 128 // to move among windows as tabs are dragged around.
127 scoped_ptr<FindBarGtk> find_bar_; 129 scoped_ptr<FindBarGtk> find_bar_;
128 }; 130 };
129 131
130 #endif // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_ 132 #endif // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gtk/browser_window_gtk.cc » ('j') | chrome/browser/gtk/browser_window_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698