| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 default: | 176 default: |
| 177 return kDoNotResize; | 177 return kDoNotResize; |
| 178 } | 178 } |
| 179 } | 179 } |
| 180 | 180 |
| 181 } // namespace | 181 } // namespace |
| 182 | 182 |
| 183 // static | 183 // static |
| 184 IconGroupID IconLoader::ReadGroupIDFromFilepath( | 184 IconGroupID IconLoader::ReadGroupIDFromFilepath( |
| 185 const base::FilePath& filepath) { | 185 const base::FilePath& filepath) { |
| 186 return base::StringToLowerASCII(filepath.Extension()); | 186 return base::ToLowerASCII(filepath.Extension()); |
| 187 } | 187 } |
| 188 | 188 |
| 189 // static | 189 // static |
| 190 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { | 190 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { |
| 191 return false; | 191 return false; |
| 192 } | 192 } |
| 193 | 193 |
| 194 // static | 194 // static |
| 195 content::BrowserThread::ID IconLoader::ReadIconThreadID() { | 195 content::BrowserThread::ID IconLoader::ReadIconThreadID() { |
| 196 return content::BrowserThread::FILE; | 196 return content::BrowserThread::FILE; |
| 197 } | 197 } |
| 198 | 198 |
| 199 void IconLoader::ReadIcon() { | 199 void IconLoader::ReadIcon() { |
| 200 static base::LazyInstance<IconMapper>::Leaky icon_mapper = | 200 static base::LazyInstance<IconMapper>::Leaky icon_mapper = |
| 201 LAZY_INSTANCE_INITIALIZER; | 201 LAZY_INSTANCE_INITIALIZER; |
| 202 int idr = icon_mapper.Get().Lookup(group_, icon_size_); | 202 int idr = icon_mapper.Get().Lookup(group_, icon_size_); |
| 203 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 203 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), | 204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), |
| 205 IconSizeToDIPSize(icon_size_))); | 205 IconSizeToDIPSize(icon_size_))); |
| 206 image_skia.MakeThreadSafe(); | 206 image_skia.MakeThreadSafe(); |
| 207 image_.reset(new gfx::Image(image_skia)); | 207 image_.reset(new gfx::Image(image_skia)); |
| 208 target_task_runner_->PostTask( | 208 target_task_runner_->PostTask( |
| 209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); | 209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); |
| 210 } | 210 } |
| OLD | NEW |