| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/icon_loader.h" | 5 #include "chrome/browser/icon_loader.h" | 
| 6 | 6 | 
| 7 #include <map> | 7 #include <map> | 
| 8 #include <string> | 8 #include <string> | 
| 9 #include <utility> | 9 #include <utility> | 
| 10 | 10 | 
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 178 } | 178 } | 
| 179 | 179 | 
| 180 }  // namespace | 180 }  // namespace | 
| 181 | 181 | 
| 182 // static | 182 // static | 
| 183 IconGroupID IconLoader::ReadGroupIDFromFilepath( | 183 IconGroupID IconLoader::ReadGroupIDFromFilepath( | 
| 184     const base::FilePath& filepath) { | 184     const base::FilePath& filepath) { | 
| 185   return StringToLowerASCII(filepath.Extension()); | 185   return StringToLowerASCII(filepath.Extension()); | 
| 186 } | 186 } | 
| 187 | 187 | 
|  | 188 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { | 
|  | 189   return false; | 
|  | 190 } | 
|  | 191 | 
| 188 void IconLoader::ReadIcon() { | 192 void IconLoader::ReadIcon() { | 
| 189   static base::LazyInstance<IconMapper>::Leaky icon_mapper = | 193   static base::LazyInstance<IconMapper>::Leaky icon_mapper = | 
| 190       LAZY_INSTANCE_INITIALIZER; | 194       LAZY_INSTANCE_INITIALIZER; | 
| 191   int idr = icon_mapper.Get().Lookup(group_, icon_size_); | 195   int idr = icon_mapper.Get().Lookup(group_, icon_size_); | 
| 192   ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 196   ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 
| 193   gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), | 197   gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), | 
| 194                                         IconSizeToDIPSize(icon_size_))); | 198                                         IconSizeToDIPSize(icon_size_))); | 
| 195   image_skia.MakeThreadSafe(); | 199   image_skia.MakeThreadSafe(); | 
| 196   image_.reset(new gfx::Image(image_skia)); | 200   image_.reset(new gfx::Image(image_skia)); | 
| 197   target_message_loop_->PostTask( | 201   target_message_loop_->PostTask( | 
| 198       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); | 202       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); | 
| 199 } | 203 } | 
| OLD | NEW | 
|---|