Add support for multi resolution icons

chrome/browser/themes/theme_service.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/themes/theme_service.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 200 matching lines @@
 
   registrar_.Add(this,
                  NotificationType::THEME_INSTALLED,
                  Source<Profile>(profile_));
 
   LoadThemePrefs();
 }
 
 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;
+}
 
-  if (!bitmap)
-    bitmap = rb_.GetBitmapNamed(id);
+bool ThemeService::GetBitmapsNamed(int id, std::vector<SkBitmap*>& bitmaps)
+    const {
+  DCHECK(CalledOnValidThread());
 
-  return bitmap;
+  if (theme_pack_.get() && theme_pack_->GetBitmapsNamed(id, bitmaps))
+    return true;
+
+  return rb_.GetBitmapsNamed(id, bitmaps);
 }
 
 SkColor ThemeService::GetColor(int id) const {
   DCHECK(CalledOnValidThread());
 
   SkColor color;
   if (theme_pack_.get() && theme_pack_->GetColor(id, &color))
     return color;
 
   // For backward compat with older themes, some newer colors are generated from
@@ skipping 406 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }