Add support for multi resolution icons

chrome/browser/themes/theme_service.cc

Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 72a2dba69e0a55149441e02892a015df4fecfc67..1a04532da537fd4c7322860bc2a6f1f0a0793747 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -218,16 +218,24 @@ void ThemeService::Init(Profile* profile) {
 
 SkBitmap* ThemeService::GetBitmapNamed(int id) const {
   DCHECK(CalledOnValidThread());
+  std::vector<SkBitmap*> bitmaps;
+  if (!GetBitmapsNamed(id, bitmaps))
+    return NULL;
 
-  SkBitmap* bitmap = NULL;
+  if (!bitmaps.empty())
+    return *bitmaps.begin();
 
-  if (theme_pack_.get())
-    bitmap = theme_pack_->GetBitmapNamed(id);
+  return NULL;
+}
+
+bool ThemeService::GetBitmapsNamed(int id, std::vector<SkBitmap*>& bitmaps)
+    const {
+  DCHECK(CalledOnValidThread());
 
-  if (!bitmap)
-    bitmap = rb_.GetBitmapNamed(id);
+  if (theme_pack_.get() && theme_pack_->GetBitmapsNamed(id, bitmaps))
+    return true;
 
-  return bitmap;
+  return rb_.GetBitmapsNamed(id, bitmaps);
 }
 
 SkColor ThemeService::GetColor(int id) const {