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

12 files changed, 18 insertions, 18 deletions

diff --git a/ui/views/demo/main.cc b/ui/views/demo/main.cc
index f3b2763..eca756f 100644
--- a/ui/views/demo/main.cc
+++ b/ui/views/demo/main.cc
@@ -10,7 +10,7 @@
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/native_widget_win.h"
diff --git a/ui/views/events/event.h b/ui/views/events/event.h
index c3cbce0..65d31f6 100644
--- a/ui/views/events/event.h
+++ b/ui/views/events/event.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "gfx/point.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/point.h"
 #include "ui/views/native_types.h"
 
 class OSExchangeData;
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index a4a919c..1f48744 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -12,7 +12,7 @@
 
 #include "base/basictypes.h"
 #include "base/singleton.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/events/accelerator.h"
 #include "ui/views/events/focus_event.h"
 
diff --git a/ui/views/native_types.h b/ui/views/native_types.h
index c17a1bb..73b0358 100644
--- a/ui/views/native_types.h
+++ b/ui/views/native_types.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_NATIVE_TYPES_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace ui {
 
diff --git a/ui/views/rendering/border.cc b/ui/views/rendering/border.cc
index 34493e6..c4d0200 100644
--- a/ui/views/rendering/border.cc
+++ b/ui/views/rendering/border.cc
@@ -4,7 +4,7 @@
 
 #include "ui/views/rendering/border.h"
 
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/view.h"
 
 namespace ui {
diff --git a/ui/views/rendering/border.h b/ui/views/rendering/border.h
index e1b196f..6a24411 100644
--- a/ui/views/rendering/border.h
+++ b/ui/views/rendering/border.h
@@ -6,8 +6,8 @@
 #define UI_VIEWS_BORDER_H_
 
 #include "base/logging.h"
-#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/insets.h"
 
 namespace gfx {
 class Canvas;
diff --git a/ui/views/rendering/border_unittest.cc b/ui/views/rendering/border_unittest.cc
index 507c904..2b7740d 100644
--- a/ui/views/rendering/border_unittest.cc
+++ b/ui/views/rendering/border_unittest.cc
@@ -4,8 +4,8 @@
 
 #include <algorithm>
 
-#include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/rendering/border.h"
 #include "ui/views/view.h"
 
diff --git a/ui/views/view.cc b/ui/views/view.cc
index b102eef..ac4bd11 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -7,10 +7,10 @@
 #include <algorithm>
 #include <functional>
 
-#include "gfx/canvas.h"
-#include "gfx/point.h"
-#include "gfx/size.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/size.h"
 #include "ui/views/events/context_menu_controller.h"
 #include "ui/views/events/drag_controller.h"
 #include "ui/views/layout/layout_manager.h"
diff --git a/ui/views/view.h b/ui/views/view.h
index 701efea..e3940fc 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -9,8 +9,8 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "gfx/native_widget_types.h"
-#include "gfx/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 
 namespace gfx {
 class Canvas;
@@ -443,4 +443,4 @@ TODO(beng):
 - native_widget_views
 - native_widget_gtk
 
-*/
\ No newline at end of file
+*/
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 14873a0..3d5e954 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -4,8 +4,8 @@
 
 #include <algorithm>
 
-#include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index 15e9aff..250ae2f 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -5,12 +5,12 @@
 #include "ui/views/widget/native_widget_win.h"
 
 #include "base/scoped_ptr.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/path.h"
-#include "gfx/native_theme_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/native_theme_win.h"
+#include "ui/gfx/path.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 56515d1..3a375bc 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "gfx/point.h"
+#include "ui/gfx/point.h"
 #include "ui/views/native_types.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/native_widget_listener.h"