Fix a regression with setting the toolstrip background.

BUG=23458
TEST=Load an extension with a toolstrip. The toolstrip's background should match the shelf's background for your theme.

Review URL: http://codereview.chromium.org/243114

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28177 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/extension_view_mac.mm b/chrome/browser/cocoa/extension_view_mac.mm
index b8e11f7..53db3f2 100644
--- a/chrome/browser/cocoa/extension_view_mac.mm
+++ b/chrome/browser/cocoa/extension_view_mac.mm
@@ -37,7 +37,11 @@ RenderViewHost* ExtensionViewMac::render_view_host() const {
 
 void ExtensionViewMac::SetBackground(const SkBitmap& background) {
   DCHECK(render_widget_host_view_);
-  render_widget_host_view_->SetBackground(background);
+  if (render_view_host()->IsRenderViewLive()) {
+    render_widget_host_view_->SetBackground(background);
+  } else {
+    pending_background_ = background;
+  }
 }
 
 void ExtensionViewMac::UpdatePreferredWidth(int pref_width) {
@@ -55,6 +59,13 @@ void ExtensionViewMac::UpdatePreferredWidth(int pref_width) {
   [view setNeedsDisplay:YES];
 }
 
+void ExtensionViewMac::RenderViewCreated() {
+  if (!pending_background_.empty()) {
+    render_widget_host_view_->SetBackground(pending_background_);
+    pending_background_.reset();
+  }
+}
+
 void ExtensionViewMac::CreateWidgetHostView() {
   DCHECK(!render_widget_host_view_);
   render_widget_host_view_ = new RenderWidgetHostViewMac(render_view_host());