summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/extension_view_mac.mm
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 00:26:44 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 00:26:44 +0000
commit67914035cd44f21216a99a54c91ba7faf5408ee0 (patch)
treec9f4dbbda517fbf1afddfcdf54002a5f1d4f0a65 /chrome/browser/cocoa/extension_view_mac.mm
parentaaf445dc29da0899bcd2fdd8a966ab6dc18b4734 (diff)
downloadchromium_src-67914035cd44f21216a99a54c91ba7faf5408ee0.zip
chromium_src-67914035cd44f21216a99a54c91ba7faf5408ee0.tar.gz
chromium_src-67914035cd44f21216a99a54c91ba7faf5408ee0.tar.bz2
Add NULL-checks to render_view_host->view() to fix startup test crash.
TBR=erikkay Review URL: http://codereview.chromium.org/258040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/extension_view_mac.mm')
-rw-r--r--chrome/browser/cocoa/extension_view_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/extension_view_mac.mm b/chrome/browser/cocoa/extension_view_mac.mm
index 53db3f2..c9844b3 100644
--- a/chrome/browser/cocoa/extension_view_mac.mm
+++ b/chrome/browser/cocoa/extension_view_mac.mm
@@ -60,7 +60,7 @@ void ExtensionViewMac::UpdatePreferredWidth(int pref_width) {
}
void ExtensionViewMac::RenderViewCreated() {
- if (!pending_background_.empty()) {
+ if (!pending_background_.empty() && render_view_host()->view()) {
render_widget_host_view_->SetBackground(pending_background_);
pending_background_.reset();
}