Revert 94715 - Revert 94714 - Improve layout for bookmark-apps. Add treatment for small icons.

chrome/browser/ui/webui/extension_icon_source.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/webui/extension_icon_source.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 57 matching lines @@
 
 ExtensionIconSource::~ExtensionIconSource() {
   // Clean up all the temporary data we're holding for requests.
   STLDeleteValues(&request_map_);
 }
 
 // static
 GURL ExtensionIconSource::GetIconURL(const Extension* extension,
                                      Extension::Icons icon_size,
                                      ExtensionIconSet::MatchType match,
-                                     bool grayscale) {
+                                     bool grayscale,
+                                     bool* exists) {
+  if (exists)
+    *exists = true;
   if (extension->id() == extension_misc::kWebStoreAppId)
     return GURL("chrome://theme/IDR_WEBSTORE_ICON");
 
+  if (exists && extension->GetIconURL(icon_size, match) == GURL())
+    *exists = false;
+
   GURL icon_url(base::StringPrintf("%s%s/%d/%d%s",
                                    chrome::kChromeUIExtensionIconURL,
                                    extension->id().c_str(),
                                    icon_size,
                                    match,
                                    grayscale ? "?grayscale=true" : ""));
   CHECK(icon_url.is_valid());
   return icon_url;
 }
 
@@ skipping 225 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }