summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 02:16:47 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 02:16:47 +0000
commit0e140cfe54405625ae8af1fc540a9bf8965616e6 (patch)
tree422c42af3e157374500c726c4ea2132e6ab40a5e /views
parent34150bd49c099265dac814b1d30e5f7b4c500fec (diff)
downloadchromium_src-0e140cfe54405625ae8af1fc540a9bf8965616e6.zip
chromium_src-0e140cfe54405625ae8af1fc540a9bf8965616e6.tar.gz
chromium_src-0e140cfe54405625ae8af1fc540a9bf8965616e6.tar.bz2
gtk views: NULL-check fixed_ before hiding
Due to a bug in the test setup, these critical errors were not causing DCHECKs. Fixing that bug caused this bug to become more visible. BUG=62868 TEST=no more critical errors in ExtensionApiTest.GetViews and others Review URL: http://codereview.chromium.org/4856001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/native/native_view_host_gtk.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc
index 2ba10b8..4a6d155 100644
--- a/views/controls/native/native_view_host_gtk.cc
+++ b/views/controls/native/native_view_host_gtk.cc
@@ -244,7 +244,8 @@ void NativeViewHostGtk::ShowWidget(int x, int y, int w, int h) {
}
void NativeViewHostGtk::HideWidget() {
- gtk_widget_hide(fixed_);
+ if (fixed_)
+ gtk_widget_hide(fixed_);
}
void NativeViewHostGtk::SetFocus() {