diff options
| author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 13:11:26 +0000 |
|---|---|---|
| committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 13:11:26 +0000 |
| commit | 1221a4986874489ce7250ae9f061add5d3aefbe1 (patch) | |
| tree | 0d124297a716199ae3cbf710e0b9fb72ec15ff7c /chrome/browser/favicon/favicon_util.cc | |
| parent | c8667526ac77d3b3886d8112af3dd1e2f9288ec6 (diff) | |
| download | chromium_src-1221a4986874489ce7250ae9f061add5d3aefbe1.zip chromium_src-1221a4986874489ce7250ae9f061add5d3aefbe1.tar.gz chromium_src-1221a4986874489ce7250ae9f061add5d3aefbe1.tar.bz2 | |
Revert 211085 "Preparation for supporting high dpi favicons in I..."
This failed the "sizes" bot because it added static initializers in favicon_url_parser.cc
> Preparation for supporting high dpi favicons in Instant Extended.
>
> The logic in FaviconSource::ParsePath() has been moved from chrome/browser/ui/* to chrome/common/favicon* allowing it to be used from the renderer. Also, chrome/browser/favicon/favicon_types.h to chrome/common/favicon/favicon_types.h for the same reason.
>
> Related internal CL: cl/46805180
>
> To test this CL:
> 1) git cl patch 15388002
> 2) ./build/gyp_chromium
> 2) compile chrome
> 3) run chrome with --enable-instant-extended-api
>
>
> BUG=227087
>
> Review URL: https://chromiumcodereview.appspot.com/15388002
TBR=pedrosimonetti@chromium.org
Review URL: https://codereview.chromium.org/18337015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon/favicon_util.cc')
| -rw-r--r-- | chrome/browser/favicon/favicon_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/favicon/favicon_util.cc b/chrome/browser/favicon/favicon_util.cc index 456df8f6..21c9d75 100644 --- a/chrome/browser/favicon/favicon_util.cc +++ b/chrome/browser/favicon/favicon_util.cc @@ -4,8 +4,8 @@ #include "chrome/browser/favicon/favicon_util.h" +#include "chrome/browser/favicon/favicon_types.h" #include "chrome/browser/history/select_favicon_frames.h" -#include "chrome/common/favicon/favicon_types.h" #include "content/public/browser/render_view_host.h" #include "content/public/child/image_decoder_utils.h" #include "skia/ext/image_operations.h" |