summaryrefslogtreecommitdiffstats
path: root/views/controls/native_control_gtk.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 22:12:23 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-30 22:12:23 +0000
commitee8f54a54cab5cc3eaf837622ec61b482fac8858 (patch)
tree4e9b080e8415af1662fe21357f39c16a1587a7ef /views/controls/native_control_gtk.cc
parent9487e849e3692811cc0f4a96373234176b78a943 (diff)
downloadchromium_src-ee8f54a54cab5cc3eaf837622ec61b482fac8858.zip
chromium_src-ee8f54a54cab5cc3eaf837622ec61b482fac8858.tar.gz
chromium_src-ee8f54a54cab5cc3eaf837622ec61b482fac8858.tar.bz2
Fixes to get gtk/views to bring up browser window w/out crashing
TBR: beng Review URL: http://codereview.chromium.org/118051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native_control_gtk.cc')
-rw-r--r--views/controls/native_control_gtk.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc
index cae4476..b1ec8b7 100644
--- a/views/controls/native_control_gtk.cc
+++ b/views/controls/native_control_gtk.cc
@@ -32,13 +32,13 @@ void NativeControlGtk::SetEnabled(bool enabled) {
void NativeControlGtk::ViewHierarchyChanged(bool is_add, View* parent,
View* child) {
+ // Call the base class to hide the view if we're being removed.
+ NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
+
// Create the widget when we're added to a valid Widget. Many controls need a
// parent widget to function properly.
if (is_add && GetWidget() && !native_view())
CreateNativeControl();
-
- // Call the base class to hide the view if we're being removed.
- NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
}
void NativeControlGtk::VisibilityChanged(View* starting_from, bool is_visible) {