| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_manager.h" | 5 #include "chrome/browser/icon_manager.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/stl_util-inl.h" | 9 #include "base/stl_util.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| 11 #include "third_party/skia/include/core/SkCanvas.h" | 11 #include "third_party/skia/include/core/SkCanvas.h" |
| 12 | 12 |
| 13 struct IconManager::ClientRequest { | 13 struct IconManager::ClientRequest { |
| 14 scoped_refptr<IconRequest> request; | 14 scoped_refptr<IconRequest> request; |
| 15 IconGroupID group; | 15 IconGroupID group; |
| 16 IconLoader::IconSize size; | 16 IconLoader::IconSize size; |
| 17 }; | 17 }; |
| 18 | 18 |
| 19 IconManager::IconManager() { | 19 IconManager::IconManager() { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 IconLoader::IconSize size) | 94 IconLoader::IconSize size) |
| 95 : group(group), | 95 : group(group), |
| 96 size(size) { | 96 size(size) { |
| 97 } | 97 } |
| 98 | 98 |
| 99 bool IconManager::CacheKey::operator<(const CacheKey &other) const { | 99 bool IconManager::CacheKey::operator<(const CacheKey &other) const { |
| 100 if (group != other.group) | 100 if (group != other.group) |
| 101 return group < other.group; | 101 return group < other.group; |
| 102 return size < other.size; | 102 return size < other.size; |
| 103 } | 103 } |
| OLD | NEW |