Adds a default icon to the install dialog if the extension

chrome/browser/views/extensions/extension_install_prompt.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 14 matching lines @@
 
 const int kRightColumnWidth = 270;
 const int kIconSize = 85;
 
 // Implements the extension installation prompt for Windows.
 class InstallDialogContent : public views::View, public views::DialogDelegate {
  public:
   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,
                               UTF8ToWide(extension->name())));
     heading_->SetFont(heading_->GetFont().DeriveFont(1, gfx::Font::BOLD));
     heading_->SetMultiLine(true);
     heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(heading_);
 
     warning_ = new views::Label(warning_text);
@@ skipping 35 matching lines @@
   // WindowDelegate
   virtual bool IsModal() const { return true; }
   virtual std::wstring GetWindowTitle() const {
     return l10n_util::GetString(IDS_EXTENSION_PROMPT_TITLE);
   }
   virtual views::View* GetContentsView() { return this; }
 
   // 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);
     height += kPanelVertMargin;
     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);
     heading_->SetY(y);
     y += heading_->height();
 
     y += kPanelVertMargin;
 
     warning_->SizeToFit(kRightColumnWidth);
     warning_->SetX(x);
@@ skipping 25 matching lines @@
   BrowserWindow* window = browser->window();
   if (!window) {
     delegate->AbortInstall();
     return;
   }
 
   views::Window::CreateChromeWindow(window->GetNativeHandle(), gfx::Rect(),
       new InstallDialogContent(delegate, extension, icon,
                                warning_text))->Show();
 }