manifest: allow the icon downloader to choose non-square icons

chrome/browser/manifest/manifest_icon_downloader.cc

 // Copyright 2015 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/manifest/manifest_icon_downloader.h"
 
 #include <limits>
 
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 108 matching lines @@
 
     if (best_delta > 0 && delta < 0)
       continue;
 
     if ((best_delta > 0 && delta < best_delta) ||
         (best_delta < 0 && delta > best_delta && delta >= max_negative_delta)) {
       best_index = i;
       best_delta = delta;
     }
   }
+
+  if (best_index != -1)
+    return best_index;
+
+  // There was no square icon of a correct size found. Try to find the most
+  // square-like icon which has both dimensions greater than the minimum size.
+  float best_ratio_difference = std::numeric_limits<float>::infinity();
+  for (size_t i = 0; i < bitmaps.size(); ++i) {
+    if (bitmaps[i].height() < minimum_icon_size_in_px ||
+        bitmaps[i].width() < minimum_icon_size_in_px) {
+      continue;
+    }
+
+    float height = static_cast<float>(bitmaps[i].height());
+    float width = static_cast<float>(bitmaps[i].width());
+    float ratio = height / width;

[mlamouri (slow - plz ping), 2015/09/23 13:45:21]

nit: you could inline the static_cast<float> in this line (as you prefer)

[Lalit Maganti, 2015/09/23 13:50:02]

With the inlining this line became way too long. Dan suggested I non-inline it.

+    float ratio_difference = fabs(ratio - 1);
+    if (ratio_difference < best_ratio_difference) {
+      best_index = i;
+      best_ratio_difference = ratio_difference;
+    }
+  }
+
   return best_index;
 }