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

26 files changed, 33 insertions, 33 deletions

diff --git a/ui/base/animation/animation.cc b/ui/base/animation/animation.cc
index 1824774..78ee4d9 100644
--- a/ui/base/animation/animation.cc
+++ b/ui/base/animation/animation.cc
@@ -4,10 +4,10 @@
 
 #include "ui/base/animation/animation.h"
 
-#include "gfx/rect.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/tween.h"
+#include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc
index 131e686..515ae57 100644
--- a/ui/base/animation/tween.cc
+++ b/ui/base/animation/tween.cc
@@ -11,7 +11,7 @@
 #endif
 
 #include "base/logging.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace ui {
 
diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc
index 4b9bf603..cfd14f8 100644
--- a/ui/base/clipboard/clipboard.cc
+++ b/ui/base/clipboard/clipboard.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "gfx/size.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/clipboard/clipboard_linux.cc b/ui/base/clipboard/clipboard_linux.cc
index da24c4f..f9ec174 100644
--- a/ui/base/clipboard/clipboard_linux.cc
+++ b/ui/base/clipboard/clipboard_linux.cc
@@ -14,8 +14,8 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/gtk_util.h"
-#include "gfx/size.h"
+#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index fb62346..89ad97d 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -13,8 +13,8 @@
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/size.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index 866db6c..e8c6983 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -10,11 +10,11 @@
 #include "base/scoped_ptr.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"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
 #include "base/message_loop.h"
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 7c21dcf..88a1ff5 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -17,8 +17,8 @@
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/size.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 43ffaad..42ca835 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -10,7 +10,7 @@
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/size.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.h b/ui/base/dragdrop/os_exchange_data_provider_gtk.h
index 2025b98..e87acac 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_gtk.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.h
@@ -13,9 +13,9 @@
 
 #include "base/pickle.h"
 #include "base/string16.h"
-#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/gfx/point.h"
 
 namespace ui {
 
diff --git a/ui/base/l10n/l10n_font_util.cc b/ui/base/l10n/l10n_font_util.cc
index 9228de9..63d58e0 100644
--- a/ui/base/l10n/l10n_font_util.cc
+++ b/ui/base/l10n/l10n_font_util.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/l10n/l10n_font_util.h b/ui/base/l10n/l10n_font_util.h
index eca17ee..329b96d 100644
--- a/ui/base/l10n/l10n_font_util.h
+++ b/ui/base/l10n/l10n_font_util.h
@@ -6,7 +6,7 @@
 #define UI_BASE_L10N_FONT_UTIL_H_
 #pragma once
 
-#include "gfx/size.h"
+#include "ui/gfx/size.h"
 
 namespace gfx {
 class Font;
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index 26e12c85..42cf591 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -24,10 +24,10 @@
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "gfx/canvas.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/canvas.h"
 #include "unicode/rbbi.h"
 #include "unicode/uloc.h"
 
diff --git a/ui/base/models/menu_model.h b/ui/base/models/menu_model.h
index 208186d..d838a56 100644
--- a/ui/base/models/menu_model.h
+++ b/ui/base/models/menu_model.h
@@ -8,7 +8,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 6f93748..ed5c14c 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -9,10 +9,10 @@
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
-#include "gfx/codec/png_codec.h"
-#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/data_pack.h"
+#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 9a961e2..9ff0e30 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -21,7 +21,7 @@
 #include "base/ref_counted_memory.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 typedef uint32 SkColor;
diff --git a/ui/base/resource/resource_bundle_dummy.cc b/ui/base/resource/resource_bundle_dummy.cc
index 653d9f0..82afaab 100644
--- a/ui/base/resource/resource_bundle_dummy.cc
+++ b/ui/base/resource/resource_bundle_dummy.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
-#include "gfx/font.h"
-#include "gfx/platform_font_win.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/platform_font_win.h"
 
 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
 // files. The font members of ResourceBundle are never initialized in our code
diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc
index 8bef0a2..eff8bdc 100644
--- a/ui/base/resource/resource_bundle_linux.cc
+++ b/ui/base/resource/resource_bundle_linux.cc
@@ -15,10 +15,10 @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
-#include "gfx/font.h"
-#include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/gtk_util.h"
 
 namespace ui {
 
diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc
index cce0a9e..11011e2 100644
--- a/ui/base/resource/resource_bundle_posix.cc
+++ b/ui/base/resource/resource_bundle_posix.cc
@@ -9,9 +9,9 @@
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
-#include "gfx/font.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/data_pack.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 7c02db1..14b2769 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -15,10 +15,10 @@
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/win/windows_version.h"
-#include "gfx/font.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 8a262fd..132c6f5 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -14,11 +14,11 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/text/text_elider.h b/ui/base/text/text_elider.h
index 97b9542..e8e0116 100644
--- a/ui/base/text/text_elider.h
+++ b/ui/base/text/text_elider.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 
 class FilePath;
 class GURL;
diff --git a/ui/base/text/text_elider_unittest.cc b/ui/base/text/text_elider_unittest.cc
index 0889d27..7995df7 100644
--- a/ui/base/text/text_elider_unittest.cc
+++ b/ui/base/text/text_elider_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/text/text_elider.h"
+#include "ui/gfx/font.h"
 
 namespace ui {
 
diff --git a/ui/base/view_prop.h b/ui/base/view_prop.h
index 339ef7b..23c5060 100644
--- a/ui/base/view_prop.h
+++ b/ui/base/view_prop.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace ui {
 
diff --git a/ui/base/win/hwnd_util.cc b/ui/base/win/hwnd_util.cc
index 9ecff94..4bd22a6 100644
--- a/ui/base/win/hwnd_util.cc
+++ b/ui/base/win/hwnd_util.cc
@@ -5,8 +5,8 @@
 #include "ui/base/win/hwnd_util.h"
 
 #include "base/string_util.h"
-#include "gfx/rect.h"
-#include "gfx/size.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
 
 namespace ui {
 
diff --git a/ui/base/win/window_impl.h b/ui/base/win/window_impl.h
index e50159a..59b7562 100644
--- a/ui/base/win/window_impl.h
+++ b/ui/base/win/window_impl.h
@@ -14,8 +14,8 @@
 #include <string>
 
 #include "base/logging.h"
-#include "gfx/native_widget_types.h"
-#include "gfx/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 
 namespace ui {
 
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index 1232bc8..df8c8d8 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -23,9 +23,9 @@
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
-#include "gfx/rect.h"
-#include "gfx/size.h"
 #include "ui/base/x/x11_util_internal.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
 
 namespace ui {