Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4739)

Unified Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
index 243a8e8b24826fca7b38cb42b65580887bbee2b1..8894ff31ab63dfa0c8a0ff6d1de44ed07d2dc8ed 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -21,10 +21,9 @@ const int kMaxBitmapSize = 256;
////////////////////////////////////////////////////////////////////////////////
// FaviconRawBitmapHandler fetchs all bitmaps with the 'icon' (or 'shortcut
-// icon')
-// link tag, storing the one that best matches ash::kShelfSize.
-// These icon bitmaps are not resized and are not cached beyond the lifetime
-// of the class. Bitmaps larger than kMaxBitmapSize are ignored.
+// icon') link tag, storing the one that best matches ash::SHELF_SIZE. These
+// icon bitmaps are not resized and are not cached beyond the lifetime of the
+// class. Bitmaps larger than kMaxBitmapSize are ignored.
class FaviconRawBitmapHandler : public content::WebContentsObserver {
public:
@@ -145,7 +144,7 @@ void FaviconRawBitmapHandler::AddFavicon(const GURL& image_url,
if (new_bitmap.height() > kMaxBitmapSize ||
new_bitmap.width() > kMaxBitmapSize)
return;
- if (new_bitmap.height() < ash::kShelfSize)
+ if (new_bitmap.height() < ash::GetShelfConstant(ash::SHELF_SIZE))
return;
if (!bitmap_.isNull()) {
// We want the smallest icon that is large enough.

Powered by Google App Engine
This is Rietveld 408576698