From e0fc2f1f81f13440af3bb4cf5e56a031f91fc163 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Sun, 14 Mar 2010 23:30:59 +0000 Subject: Move base/gfx contents to gfx/ TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41559 0039d316-1c4b-4281-b951-d872f2087c98 --- printing/DEPS | 1 + printing/emf_win.cc | 2 +- printing/image.cc | 2 +- printing/image.h | 2 +- printing/page_setup.h | 2 +- printing/pdf_metafile_mac.cc | 2 +- printing/pdf_metafile_mac_unittest.cc | 2 +- printing/print_settings.h | 2 +- printing/printed_page.h | 4 ++-- 9 files changed, 10 insertions(+), 9 deletions(-) (limited to 'printing') diff --git a/printing/DEPS b/printing/DEPS index 64b2aab..cfb3f60 100644 --- a/printing/DEPS +++ b/printing/DEPS @@ -2,5 +2,6 @@ include_rules = [ "+app/gfx", # Font's are here. "+app", # win_util::FormatSystemTime/Date. "+base", + "+gfx", "+skia/ext", ] diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 62cc4a0..0a733af 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -7,11 +7,11 @@ #include "app/gfx/codec/jpeg_codec.h" #include "app/gfx/codec/png_codec.h" #include "app/gfx/gdi_util.h" -#include "base/gfx/rect.h" #include "base/histogram.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/time.h" +#include "gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" namespace printing { diff --git a/printing/image.cc b/printing/image.cc index 9ead5e0..685e9bd 100644 --- a/printing/image.cc +++ b/printing/image.cc @@ -6,9 +6,9 @@ #include "app/gfx/codec/png_codec.h" #include "base/file_util.h" -#include "base/gfx/rect.h" #include "base/md5.h" #include "base/string_util.h" +#include "gfx/rect.h" #include "skia/ext/platform_device.h" #if defined(OS_WIN) diff --git a/printing/image.h b/printing/image.h index f8755275..ed2820b 100644 --- a/printing/image.h +++ b/printing/image.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/gfx/size.h" #include "base/logging.h" +#include "gfx/size.h" #include "printing/native_metafile.h" namespace printing { diff --git a/printing/page_setup.h b/printing/page_setup.h index 2ae984b..a661fdb 100644 --- a/printing/page_setup.h +++ b/printing/page_setup.h @@ -5,7 +5,7 @@ #ifndef PRINTING_PAGE_SETUP_H_ #define PRINTING_PAGE_SETUP_H_ -#include "base/gfx/rect.h" +#include "gfx/rect.h" namespace printing { diff --git a/printing/pdf_metafile_mac.cc b/printing/pdf_metafile_mac.cc index ef2098c..54da147 100644 --- a/printing/pdf_metafile_mac.cc +++ b/printing/pdf_metafile_mac.cc @@ -5,10 +5,10 @@ #include "printing/pdf_metafile_mac.h" #include "base/file_path.h" -#include "base/gfx/rect.h" #include "base/logging.h" #include "base/scoped_cftyperef.h" #include "base/sys_string_conversions.h" +#include "gfx/rect.h" namespace printing { diff --git a/printing/pdf_metafile_mac_unittest.cc b/printing/pdf_metafile_mac_unittest.cc index 88f5c8f..fdf833c 100644 --- a/printing/pdf_metafile_mac_unittest.cc +++ b/printing/pdf_metafile_mac_unittest.cc @@ -9,7 +9,7 @@ #include #include -#include "base/gfx/rect.h" +#include "gfx/rect.h" #include "testing/gtest/include/gtest/gtest.h" TEST(PdfMetafileTest, Pdf) { diff --git a/printing/print_settings.h b/printing/print_settings.h index b5bb723..3a269f7 100644 --- a/printing/print_settings.h +++ b/printing/print_settings.h @@ -5,7 +5,7 @@ #ifndef PRINTING_PRINT_SETTINGS_H_ #define PRINTING_PRINT_SETTINGS_H_ -#include "base/gfx/rect.h" +#include "gfx/rect.h" #include "printing/page_overlays.h" #include "printing/page_range.h" #include "printing/page_setup.h" diff --git a/printing/printed_page.h b/printing/printed_page.h index cbc9e01..f7d2f7d 100644 --- a/printing/printed_page.h +++ b/printing/printed_page.h @@ -5,10 +5,10 @@ #ifndef PRINTING_PRINTED_PAGE_H_ #define PRINTING_PRINTED_PAGE_H_ -#include "base/gfx/rect.h" -#include "base/gfx/size.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "gfx/rect.h" +#include "gfx/size.h" #include "printing/native_metafile.h" namespace printing { -- cgit v1.1