Change includes of gfx/* to ui/gfx/*

BUG=71063
TEST=compiled

Review URL: http://codereview.chromium.org/6312156

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 21 insertions, 21 deletions

diff --git a/printing/DEPS b/printing/DEPS
index c95a42a..03fe6d7 100644
--- a/printing/DEPS
+++ b/printing/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+base",
-  "+gfx",
   "+skia/ext",
   "+ui/base/text",
+  "+ui/gfx",
 ]
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 5de962b..f2b22fa 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -9,11 +9,11 @@
 #include "base/metrics/histogram.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "gfx/codec/jpeg_codec.h"
-#include "gfx/codec/png_codec.h"
-#include "gfx/gdi_util.h"
-#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/gdi_util.h"
+#include "ui/gfx/rect.h"
 
 namespace {
 const int kCustomGdiCommentSignature = 0xdeadbabe;
diff --git a/printing/image.cc b/printing/image.cc
index dd52380..1116f32 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -7,8 +7,8 @@
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_number_conversions.h"
-#include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/codec/png_codec.h"
 
 namespace printing {
 
diff --git a/printing/image.h b/printing/image.h
index d10c61b..5d84c8d 100644
--- a/printing/image.h
+++ b/printing/image.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "gfx/size.h"
 #include "printing/native_metafile.h"
+#include "ui/gfx/size.h"
 
 class FilePath;
 
diff --git a/printing/image_mac.cc b/printing/image_mac.cc
index 8b3d638..b11757d 100644
--- a/printing/image_mac.cc
+++ b/printing/image_mac.cc
@@ -7,7 +7,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 
 #include "base/mac/scoped_cftyperef.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace printing {
 
diff --git a/printing/image_win.cc b/printing/image_win.cc
index e8bd368..c4bc1a7 100644
--- a/printing/image_win.cc
+++ b/printing/image_win.cc
@@ -4,9 +4,9 @@
 
 #include "printing/image.h"
 
-#include "gfx/gdi_util.h"  // EMF support
-#include "gfx/rect.h"
 #include "skia/ext/platform_device.h"
+#include "ui/gfx/gdi_util.h"  // EMF support
+#include "ui/gfx/rect.h"
 
 namespace {
 
diff --git a/printing/page_setup.h b/printing/page_setup.h
index a4a8680..d96980f 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 "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace printing {
 
diff --git a/printing/pdf_metafile_mac.cc b/printing/pdf_metafile_mac.cc
index 2533205..e414181 100644
--- a/printing/pdf_metafile_mac.cc
+++ b/printing/pdf_metafile_mac.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 using base::mac::ScopedCFTypeRef;
 
diff --git a/printing/pdf_metafile_mac_unittest.cc b/printing/pdf_metafile_mac_unittest.cc
index c72b265..ec8cd3a 100644
--- a/printing/pdf_metafile_mac_unittest.cc
+++ b/printing/pdf_metafile_mac_unittest.cc
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
 
 TEST(PdfMetafileTest, Pdf) {
   // Test in-renderer constructor.
diff --git a/printing/print_settings.h b/printing/print_settings.h
index 298fcd2..2ec5462 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -5,10 +5,10 @@
 #ifndef PRINTING_PRINT_SETTINGS_H_
 #define PRINTING_PRINT_SETTINGS_H_
 
-#include "gfx/rect.h"
 #include "printing/page_overlays.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
+#include "ui/gfx/rect.h"
 
 namespace printing {
 
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 56a340f..d33751c 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -17,7 +17,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/i18n/time_formatting.h"
-#include "gfx/font.h"
 #include "printing/page_number.h"
 #include "printing/page_overlays.h"
 #include "printing/printed_pages_source.h"
@@ -25,6 +24,7 @@
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
 #include "ui/base/text/text_elider.h"
+#include "ui/gfx/font.h"
 
 namespace {
 
diff --git a/printing/printed_document.h b/printing/printed_document.h
index 599d453..e71f431 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -11,10 +11,10 @@
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
-#include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "printing/print_settings.h"
 #include "printing/native_metafile.h"
+#include "ui/gfx/native_widget_types.h"
 
 class FilePath;
 class MessageLoop;
diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc
index 32a71a9..938e2b5 100644
--- a/printing/printed_document_win.cc
+++ b/printing/printed_document_win.cc
@@ -7,13 +7,13 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "printing/page_number.h"
 #include "printing/page_overlays.h"
 #include "printing/printed_pages_source.h"
 #include "printing/printed_page.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
+#include "ui/gfx/font.h"
 
 namespace {
 
diff --git a/printing/printed_page.h b/printing/printed_page.h
index 65df888..bd1d123 100644
--- a/printing/printed_page.h
+++ b/printing/printed_page.h
@@ -7,9 +7,9 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "gfx/rect.h"
-#include "gfx/size.h"
 #include "printing/native_metafile.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
 
 namespace printing {
 
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 8cb4f25..353c36d 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/string16.h"
-#include "gfx/native_widget_types.h"
 #include "printing/print_settings.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace printing {
 
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index 7d3818f..361fbe6 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -12,8 +12,8 @@
 
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
-#include "gfx/native_widget_types.h"
 #include "printing/printing_context.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace printing {