diff options
| author | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:19:13 +0000 |
|---|---|---|
| committer | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 23:19:13 +0000 |
| commit | 1168b68bbbbf53df44445820f58b06e45421c628 (patch) | |
| tree | 8344adb629fdd005f42cdac982e8781acfc4ccc8 /chrome/browser | |
| parent | 73985d52333791ca32c1eb74457040765333f380 (diff) | |
| download | chromium_src-1168b68bbbbf53df44445820f58b06e45421c628.zip chromium_src-1168b68bbbbf53df44445820f58b06e45421c628.tar.gz chromium_src-1168b68bbbbf53df44445820f58b06e45421c628.tar.bz2 | |
Don't assume render view host exists in Panel.
Tests may not supply tab contents or the Panel might be closing and tab contents destroyed when the GTK Panel gets a size change.
BUG=102776
TEST=Panel*Test.*
Review URL: http://codereview.chromium.org/8455001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/panels/panel.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index 99c4ae2..8c416af 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -582,9 +582,10 @@ RenderViewHost* Panel::GetRenderViewHost() const { void Panel::RequestRenderViewHostToDisableScrollbars( RenderViewHost* render_view_host) { - DCHECK(render_view_host); - render_view_host->DisableScrollbarsForThreshold( - native_panel_->ContentSizeFromWindowSize(max_size_)); + if (render_view_host) { + render_view_host->DisableScrollbarsForThreshold( + native_panel_->ContentSizeFromWindowSize(max_size_)); + } } void Panel::OnWindowSizeAvailable() { |