| 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/favicon/favicon_handler.h" | 5 #include "chrome/browser/favicon/favicon_handler.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
| 14 #include "base/memory/ref_counted_memory.h" | 14 #include "base/memory/ref_counted_memory.h" |
| 15 #include "chrome/browser/favicon/favicon_service_factory.h" | 15 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 16 #include "chrome/browser/favicon/favicon_util.h" | 16 #include "chrome/browser/favicon/favicon_util.h" |
| 17 #include "chrome/browser/history/select_favicon_frames.h" | 17 #include "components/favicon_base/select_favicon_frames.h" |
| 18 #include "content/public/browser/favicon_status.h" | 18 #include "content/public/browser/favicon_status.h" |
| 19 #include "content/public/browser/navigation_entry.h" | 19 #include "content/public/browser/navigation_entry.h" |
| 20 #include "skia/ext/image_operations.h" | 20 #include "skia/ext/image_operations.h" |
| 21 #include "ui/gfx/codec/png_codec.h" | 21 #include "ui/gfx/codec/png_codec.h" |
| 22 #include "ui/gfx/image/image.h" | 22 #include "ui/gfx/image/image.h" |
| 23 #include "ui/gfx/image/image_skia.h" | 23 #include "ui/gfx/image/image_skia.h" |
| 24 #include "ui/gfx/image/image_util.h" | 24 #include "ui/gfx/image/image_util.h" |
| 25 | 25 |
| 26 using content::FaviconURL; | 26 using content::FaviconURL; |
| 27 using content::NavigationEntry; | 27 using content::NavigationEntry; |
| (...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 } else { | 717 } else { |
| 718 gfx::Size largest = i->icon_sizes[index]; | 718 gfx::Size largest = i->icon_sizes[index]; |
| 719 i->icon_sizes.clear(); | 719 i->icon_sizes.clear(); |
| 720 i->icon_sizes.push_back(largest); | 720 i->icon_sizes.push_back(largest); |
| 721 ++i; | 721 ++i; |
| 722 } | 722 } |
| 723 } | 723 } |
| 724 std::stable_sort(image_urls_.begin(), image_urls_.end(), | 724 std::stable_sort(image_urls_.begin(), image_urls_.end(), |
| 725 CompareIconSize); | 725 CompareIconSize); |
| 726 } | 726 } |
| OLD | NEW |