Fix the placement of dangerous download warning icons in DownloadItemView.

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 807 matching lines @@
               download_util::SMALL);
         } else {
           download_util::PaintDownloadComplete(canvas, this, 0, 0,
               complete_animation_->GetCurrentValue(),
               download_util::SMALL);
         }
       }
     }
 
     // Draw the icon image.
-    int mirrored_x = GetMirroredXWithWidthInView(
-        download_util::kSmallProgressIconOffset, icon->width());
+    int icon_x, icon_y;
+
+    if (IsDangerousMode()) {
+      icon_x = GetMirroredXWithWidthInView(
+          kLeftPadding + dangerous_mode_body_image_set_.top_left->width(),

[msw, 2011/11/21 18:39:20]

Is there a reason to add the 0px kLeftPadding here?

[msw, 2011/11/21 18:39:20]

Use the body_image_set local instead.
Can you consolidate this code a litte more between the two images?

[asanka, 2011/11/21 20:45:32]

Done.

[asanka, 2011/11/21 20:45:32]

I'm mirroring the logic in DIV::Layout() and DIV::GetPreferredSize() for
calculating the icon position, which is where kLeftPadding comes from.

+          icon->width());
+      icon_y = (height() - icon->height()) / 2;
+    } else {
+      icon_x = GetMirroredXWithWidthInView(
+          download_util::kSmallProgressIconOffset, icon->width());
+      icon_y = download_util::kSmallProgressIconOffset;
+    }
     if (IsEnabled()) {
-      canvas->DrawBitmapInt(*icon, mirrored_x,
-                            download_util::kSmallProgressIconOffset);
+      canvas->DrawBitmapInt(*icon, icon_x, icon_y);
     } else {
       // Use an alpha to make the image look disabled.
       SkPaint paint;
       paint.setAlpha(120);
-      canvas->DrawBitmapInt(*icon, mirrored_x,
-                            download_util::kSmallProgressIconOffset, paint);
+      canvas->DrawBitmapInt(*icon, icon_x, icon_y, paint);
     }
   }
 }
 
 void DownloadItemView::OpenDownload() {
   // We're interested in how long it takes users to open downloads.  If they
   // open downloads super quickly, we should be concerned about clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
   download_->OpenDownload();
@@ skipping 275 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }