From ebe974f000199a7020da9855e326b31daad59be3 Mon Sep 17 00:00:00 2001 From: tfarina Date: Fri, 2 Jan 2015 20:25:32 -0800 Subject: Cleanup: Update the path to gfx size headers. The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so we are updating the include paths to fix this. BUG=395370 TEST=compiles TBR=sky@chromium.org,danakj@chromium.org Review URL: https://codereview.chromium.org/832953002 Cr-Commit-Position: refs/heads/master@{#309873} --- components/favicon_base/favicon_types.h | 2 +- components/favicon_base/favicon_util.cc | 2 +- components/favicon_base/select_favicon_frames.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'components/favicon_base') diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h index f99f038..ea64754 100644 --- a/components/favicon_base/favicon_types.h +++ b/components/favicon_base/favicon_types.h @@ -6,8 +6,8 @@ #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ #include "base/memory/ref_counted_memory.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" #include "url/gurl.h" namespace favicon_base { diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc index af547f3..dea071f 100644 --- a/components/favicon_base/favicon_util.cc +++ b/components/favicon_base/favicon_util.cc @@ -14,9 +14,9 @@ #include "ui/base/layout.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_png_rep.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" #if defined(OS_MACOSX) && !defined(OS_IOS) #include "base/mac/mac_util.h" diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc index 492d211..1a1e526 100644 --- a/components/favicon_base/select_favicon_frames.cc +++ b/components/favicon_base/select_favicon_frames.cc @@ -13,10 +13,10 @@ #include "components/favicon_base/favicon_util.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" namespace { -- cgit v1.1