diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 03:09:06 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 03:09:06 +0000 |
| commit | 299e454ff6c973eb81a913179924df9b5802545a (patch) | |
| tree | ddcc125cb9541f571267d10067fad3dfdeaa9520 /chrome/browser/favicon/favicon_util.cc | |
| parent | 264513d9881a9e5599c67a9dded5020d06872dbd (diff) | |
| download | chromium_src-299e454ff6c973eb81a913179924df9b5802545a.zip chromium_src-299e454ff6c973eb81a913179924df9b5802545a.tar.gz chromium_src-299e454ff6c973eb81a913179924df9b5802545a.tar.bz2 | |
bookmarks: Get rid of the dependency on history_types.h
In order to do this we moved two structs (FaviconBitmapResult and
FaviconImageResult) from history to favicon.
BUG=144783
TBR=joi@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/14699005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon/favicon_util.cc')
| -rw-r--r-- | chrome/browser/favicon/favicon_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/favicon/favicon_util.cc b/chrome/browser/favicon/favicon_util.cc index 50ff94e..df96a47 100644 --- a/chrome/browser/favicon/favicon_util.cc +++ b/chrome/browser/favicon/favicon_util.cc @@ -4,7 +4,7 @@ #include "chrome/browser/favicon/favicon_util.h" -#include "chrome/browser/history/history_types.h" +#include "chrome/browser/favicon/favicon_types.h" #include "chrome/browser/history/select_favicon_frames.h" #include "content/public/browser/render_view_host.h" #include "googleurl/src/gurl.h" @@ -22,7 +22,7 @@ namespace { // |scale_factors| for which the image reps can be created without resizing // or decoding the bitmap data. std::vector<gfx::ImagePNGRep> SelectFaviconFramesFromPNGsWithoutResizing( - const std::vector<history::FaviconBitmapResult>& png_data, + const std::vector<chrome::FaviconBitmapResult>& png_data, const std::vector<ui::ScaleFactor>& scale_factors, int favicon_size) { std::vector<gfx::ImagePNGRep> png_reps; @@ -106,7 +106,7 @@ std::vector<ui::ScaleFactor> FaviconUtil::GetFaviconScaleFactors() { // static gfx::Image FaviconUtil::SelectFaviconFramesFromPNGs( - const std::vector<history::FaviconBitmapResult>& png_data, + const std::vector<chrome::FaviconBitmapResult>& png_data, const std::vector<ui::ScaleFactor>& scale_factors, int favicon_size) { // Create image reps for as many scale factors as possible without resizing |