| 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_service.h" | 5 #include "chrome/browser/favicon/favicon_service.h" |
| 6 | 6 |
| 7 #include "chrome/browser/favicon/favicon_util.h" | 7 #include "chrome/browser/favicon/favicon_util.h" |
| 8 #include "chrome/browser/favicon/select_favicon_frames.h" | |
| 9 #include "chrome/browser/history/history.h" | 8 #include "chrome/browser/history/history.h" |
| 10 #include "chrome/browser/history/history_backend.h" | 9 #include "chrome/browser/history/history_backend.h" |
| 11 #include "chrome/browser/history/history_service_factory.h" | 10 #include "chrome/browser/history/history_service_factory.h" |
| 11 #include "chrome/browser/history/select_favicon_frames.h" |
| 12 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 12 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 13 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 14 #include "third_party/skia/include/core/SkBitmap.h" | 14 #include "third_party/skia/include/core/SkBitmap.h" |
| 15 #include "ui/gfx/codec/png_codec.h" | 15 #include "ui/gfx/codec/png_codec.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 16 #include "ui/gfx/image/image_skia.h" |
| 17 | 17 |
| 18 FaviconService::FaviconService(HistoryService* history_service) | 18 FaviconService::FaviconService(HistoryService* history_service) |
| 19 : history_service_(history_service) { | 19 : history_service_(history_service) { |
| 20 } | 20 } |
| 21 | 21 |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector( | 292 bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector( |
| 293 &resized_bitmap_data); | 293 &resized_bitmap_data); |
| 294 callback.Run(handle, bitmap_result); | 294 callback.Run(handle, bitmap_result); |
| 295 } | 295 } |
| 296 | 296 |
| 297 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) { | 297 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) { |
| 298 request->ForwardResultAsync(request->handle(), | 298 request->ForwardResultAsync(request->handle(), |
| 299 std::vector<history::FaviconBitmapResult>(), | 299 std::vector<history::FaviconBitmapResult>(), |
| 300 history::IconURLSizesMap()); | 300 history::IconURLSizesMap()); |
| 301 } | 301 } |
| OLD | NEW |