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

24 files changed, 27 insertions, 25 deletions

diff --git a/app/DEPS b/app/DEPS
index c08f940..2b51fbb 100644
--- a/app/DEPS
+++ b/app/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+gfx",
   "+grit/app_locale_settings.h",
   "+grit/app_strings.h",
   "+net",
diff --git a/app/animation.cc b/app/animation.cc
index b341d2a..f2d95f4 100644
--- a/app/animation.cc
+++ b/app/animation.cc
@@ -4,8 +4,8 @@
 
 #include "app/animation.h"
 
-#include "base/gfx/rect.h"
 #include "base/message_loop.h"
+#include "gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "base/win_util.h"
diff --git a/app/clipboard/clipboard.cc b/app/clipboard/clipboard.cc
index 9ac742d..fa4f5a5 100644
--- a/app/clipboard/clipboard.cc
+++ b/app/clipboard/clipboard.cc
@@ -4,9 +4,9 @@
 
 #include "app/clipboard/clipboard.h"
 
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_linux.cc b/app/clipboard/clipboard_linux.cc
index fbffd98..e7994de 100644
--- a/app/clipboard/clipboard_linux.cc
+++ b/app/clipboard/clipboard_linux.cc
@@ -11,11 +11,11 @@
 #include <utility>
 
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/linux_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_mac.mm b/app/clipboard/clipboard_mac.mm
index 94de2b9..4673e6e 100644
--- a/app/clipboard/clipboard_mac.mm
+++ b/app/clipboard/clipboard_mac.mm
@@ -7,13 +7,13 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/scoped_cftyperef.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc
index e8c5ee0..d15247b 100644
--- a/app/clipboard/clipboard_unittest.cc
+++ b/app/clipboard/clipboard_unittest.cc
@@ -10,11 +10,11 @@
 #endif
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index b729a52..8ae60d3 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -12,13 +12,13 @@
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/scoped_clipboard_writer.cc b/app/clipboard/scoped_clipboard_writer.cc
index 5a3634f..01885ba7 100644
--- a/app/clipboard/scoped_clipboard_writer.cc
+++ b/app/clipboard/scoped_clipboard_writer.cc
@@ -8,9 +8,9 @@
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 
-#include "base/gfx/size.h"
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard)
     : clipboard_(clipboard) {
diff --git a/app/gfx/blit.cc b/app/gfx/blit.cc
index 99ac09f..62417d2 100644
--- a/app/gfx/blit.cc
+++ b/app/gfx/blit.cc
@@ -8,11 +8,11 @@
 #include <cairo/cairo.h>
 #endif
 
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #if defined(OS_MACOSX)
 #include "base/scoped_cftyperef.h"
 #endif
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 
diff --git a/app/gfx/blit.h b/app/gfx/blit.h
index 9eaa93e..f4445d3 100644
--- a/app/gfx/blit.h
+++ b/app/gfx/blit.h
@@ -6,8 +6,8 @@
 #define APP_GFX_BLIT_H_
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 
 namespace skia {
 class PlatformCanvas;
diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc
index 420c984..75f8011 100644
--- a/app/gfx/canvas.cc
+++ b/app/gfx/canvas.cc
@@ -8,8 +8,8 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
index 1b3d824..fdd1242 100644
--- a/app/gfx/canvas_linux.cc
+++ b/app/gfx/canvas_linux.cc
@@ -10,9 +10,9 @@
 #include <pango/pangocairo.h>
 
 #include "app/gfx/font.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/rect.h"
 
 namespace {
 
diff --git a/app/gfx/canvas_mac.mm b/app/gfx/canvas_mac.mm
index b766b32..acc2d71 100644
--- a/app/gfx/canvas_mac.mm
+++ b/app/gfx/canvas_mac.mm
@@ -8,9 +8,9 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
diff --git a/app/gfx/canvas_win.cc b/app/gfx/canvas_win.cc
index f35fab8..de9d45a 100644
--- a/app/gfx/canvas_win.cc
+++ b/app/gfx/canvas_win.cc
@@ -8,7 +8,7 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
diff --git a/app/gfx/font_util.h b/app/gfx/font_util.h
index 36bc693..29caeb4 100644
--- a/app/gfx/font_util.h
+++ b/app/gfx/font_util.h
@@ -5,7 +5,7 @@
 #ifndef APP_GFX_FONT_UTIL_H_
 #define APP_GFX_FONT_UTIL_H_
 
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gdi_util.h b/app/gfx/gdi_util.h
index f2f9210..7da4926 100644
--- a/app/gfx/gdi_util.h
+++ b/app/gfx/gdi_util.h
@@ -7,7 +7,8 @@
 
 #include <vector>
 #include <windows.h>
-#include "base/gfx/rect.h"
+
+#include "gfx/rect.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gtk_native_view_id_manager.cc b/app/gfx/gtk_native_view_id_manager.cc
index b0dcc10..211db4e 100644
--- a/app/gfx/gtk_native_view_id_manager.cc
+++ b/app/gfx/gtk_native_view_id_manager.cc
@@ -4,9 +4,9 @@
 
 #include "app/gfx/gtk_native_view_id_manager.h"
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
+#include "gfx/rect.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff --git a/app/gfx/gtk_util.cc b/app/gfx/gtk_util.cc
index 98b174b..32d48a5 100644
--- a/app/gfx/gtk_util.cc
+++ b/app/gfx/gtk_util.cc
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/linux_util.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 
diff --git a/app/gfx/native_theme_win.cc b/app/gfx/native_theme_win.cc
index 594042b..9c60ef9 100644
--- a/app/gfx/native_theme_win.cc
+++ b/app/gfx/native_theme_win.cc
@@ -10,9 +10,9 @@
 #include <vssym32.h>
 
 #include "app/gfx/gdi_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkShader.h"
diff --git a/app/gfx/native_theme_win.h b/app/gfx/native_theme_win.h
index 62415b4..504ce46 100644
--- a/app/gfx/native_theme_win.h
+++ b/app/gfx/native_theme_win.h
@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <uxtheme.h>
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace skia {
diff --git a/app/gfx/skia_util.cc b/app/gfx/skia_util.cc
index fa6ec24..f5f03b8 100644
--- a/app/gfx/skia_util.cc
+++ b/app/gfx/skia_util.cc
@@ -4,7 +4,7 @@
 
 #include "app/gfx/skia_util.h"
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/app/os_exchange_data_provider_gtk.h b/app/os_exchange_data_provider_gtk.h
index a53957d..6791fbe 100644
--- a/app/os_exchange_data_provider_gtk.h
+++ b/app/os_exchange_data_provider_gtk.h
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include "app/os_exchange_data.h"
-#include "base/gfx/point.h"
 #include "base/pickle.h"
 #include "base/string16.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 
 // OSExchangeData::Provider implementation for Gtk. OSExchangeDataProviderGtk
diff --git a/app/win/window_impl.h b/app/win/window_impl.h
index 2f6a2ab..b4ba830 100644
--- a/app/win/window_impl.h
+++ b/app/win/window_impl.h
@@ -13,8 +13,8 @@
 #include <string>
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
 
 namespace app {
 
diff --git a/app/win_util.h b/app/win_util.h
index 802cc35..cac4b39 100644
--- a/app/win_util.h
+++ b/app/win_util.h
@@ -12,8 +12,8 @@
 
 #include "app/gfx/font.h"
 #include "base/fix_wp64.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_handle.h"
+#include "gfx/rect.h"
 
 class FilePath;