4 files changed, 18 insertions, 17 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index b166f37..098f24b 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -47,6 +47,7 @@ without changes to the corresponding grd file. mp6 -->
       <include name="IDR_MERGE_AND_SYNC_HTML" file="sync\resources\merge_and_sync.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_block.png" type="BINDATA" />
+      <include name="IDR_DEFAULT_EXTENSION_ICON_128" file="resources\default_extension_icon_128.png" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 1023a5a..08740a5 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -7,6 +7,7 @@
 #include <map>
 
 #include "app/l10n_util.h"
+#include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/rand_util.h"
 #include "chrome/browser/browser_list.h"
@@ -15,6 +16,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
+#include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
@@ -102,6 +104,11 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate,
   }
 
 #if defined(OS_WIN) || defined(TOOLKIT_GTK)
+  if (!install_icon) {
+    install_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        IDR_DEFAULT_EXTENSION_ICON_128);
+  }
+
   ShowExtensionInstallPrompt(profile_, delegate, extension, install_icon,
                              GetInstallWarning(extension));
 
diff --git a/chrome/browser/resources/default_extension_icon_128.png b/chrome/browser/resources/default_extension_icon_128.png
new file mode 100755
index 0000000..dd88358d
--- /dev/null
+++ b/chrome/browser/resources/default_extension_icon_128.png
diff --git a/chrome/browser/views/extensions/extension_install_prompt.cc b/chrome/browser/views/extensions/extension_install_prompt.cc
index cc7d41c..e5c06c65 100644
--- a/chrome/browser/views/extensions/extension_install_prompt.cc
+++ b/chrome/browser/views/extensions/extension_install_prompt.cc
@@ -32,12 +32,10 @@ class InstallDialogContent : public views::View, public views::DialogDelegate {
   InstallDialogContent(ExtensionInstallUI::Delegate* delegate,
       Extension* extension, SkBitmap* icon, const std::wstring& warning_text)
           : delegate_(delegate), icon_(NULL) {
-    if (icon) {
-      icon_ = new views::ImageView();
-      icon_->SetImageSize(gfx::Size(kIconSize, kIconSize));
-      icon_->SetImage(*icon);
-      AddChildView(icon_);
-    }
+    icon_ = new views::ImageView();
+    icon_->SetImageSize(gfx::Size(kIconSize, kIconSize));
+    icon_->SetImage(*icon);
+    AddChildView(icon_);
 
     heading_ = new views::Label(
         l10n_util::GetStringF(IDS_EXTENSION_PROMPT_HEADING,
@@ -93,11 +91,8 @@ class InstallDialogContent : public views::View, public views::DialogDelegate {
   // View
   virtual gfx::Size GetPreferredSize() {
     int width = kRightColumnWidth + kPanelHorizMargin + kPanelHorizMargin;
-
-    if (icon_) {
-      width += kIconSize;
-      width += kPanelHorizMargin;
-    }
+    width += kIconSize;
+    width += kPanelHorizMargin;
 
     int height = kPanelVertMargin * 2;
     height += heading_->GetHeightForWidth(kRightColumnWidth);
@@ -105,18 +100,16 @@ class InstallDialogContent : public views::View, public views::DialogDelegate {
     height += warning_->GetHeightForWidth(kRightColumnWidth);
     height += kPanelVertMargin;
 
-    return gfx::Size(width, std::max(height, kIconSize));
+    return gfx::Size(width, std::max(height, kIconSize + kPanelVertMargin * 2));
   }
 
   virtual void Layout() {
     int x = kPanelHorizMargin;
     int y = kPanelVertMargin;
 
-    if (icon_) {
-      icon_->SetBounds(x, y, kIconSize, kIconSize);
-      x += kIconSize;
-      x += kPanelHorizMargin;
-    }
+    icon_->SetBounds(x, y, kIconSize, kIconSize);
+    x += kIconSize;
+    x += kPanelHorizMargin;
 
     heading_->SizeToFit(kRightColumnWidth);
     heading_->SetX(x);