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

117 files changed, 199 insertions, 199 deletions

diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index a2fed4e..d771912 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -9,9 +9,9 @@
 #include <map>
 
 #include "base/ref_counted.h"
-#include "gfx/rect.h"
 #include "ui/base/animation/animation_container_observer.h"
 #include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/rect.h"
 
 namespace ui {
 class SlideAnimation;
diff --git a/views/background.cc b/views/background.cc
index ba6216f..1c374e4 100644
--- a/views/background.cc
+++ b/views/background.cc
@@ -5,10 +5,10 @@
 #include "views/background.h"
 
 #include "base/logging.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/color_utils.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkPaint.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/color_utils.h"
 #include "views/painter.h"
 #include "views/view.h"
 
diff --git a/views/border.cc b/views/border.cc
index 1dce649..a05d51c 100644
--- a/views/border.cc
+++ b/views/border.cc
@@ -5,7 +5,7 @@
 #include "views/border.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 
 namespace views {
 
diff --git a/views/border.h b/views/border.h
index 167237f..15d94b0 100644
--- a/views/border.h
+++ b/views/border.h
@@ -6,8 +6,8 @@
 #define VIEWS_BORDER_H_
 #pragma once
 
-#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/insets.h"
 #include "views/view.h"
 
 namespace gfx{
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index bae0fcc..980efbc 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -5,7 +5,7 @@
 #include "views/controls/button/checkbox.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/label.h"
 
 namespace views {
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 820e8da..0e18377 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -5,9 +5,9 @@
 #include "views/controls/button/image_button.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
-#include "gfx/skbitmap_operations.h"
 #include "ui/base/animation/throb_animation.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/skbitmap_operations.h"
 
 namespace views {
 
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 6564a23..f56f343 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -5,12 +5,12 @@
 #include "views/controls/button/menu_button.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 75489f6..55f5a89 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/time.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 #include "views/background.h"
 #include "views/controls/button/text_button.h"
 
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 0b8da4f..65f6e0b 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -9,7 +9,7 @@
 #include "views/controls/native/native_view_host.h"
 
 #if defined(OS_WIN)
-#include "gfx/platform_font_win.h"
+#include "ui/gfx/platform_font_win.h"
 #elif defined(OS_LINUX)
 #include <gdk/gdkkeysyms.h>
 #include "views/screen.h"
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h
index 4090040..b20b2f2 100644
--- a/views/controls/button/native_button.h
+++ b/views/controls/button/native_button.h
@@ -8,7 +8,7 @@
 
 // TODO(avi): remove when not needed
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/native_button_wrapper.h"
 
diff --git a/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h
index 39202d4..37e0265 100644
--- a/views/controls/button/native_button_wrapper.h
+++ b/views/controls/button/native_button_wrapper.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index fd52f72..58723b5 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -8,9 +8,9 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h
index f9e3722..5206c22 100644
--- a/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -10,9 +10,9 @@
 
 // TODO(avi): remove when not needed
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font.h"
 #include "views/border.h"
 #include "views/controls/button/custom_button.h"
 
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 8225589..2ea60e6 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -6,10 +6,10 @@
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
-#include "gfx/native_theme_win.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index a2d5352..9de1167 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx{
 class Size;
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index e3fe5a3c..c9506b1 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
-#include "gfx/insets.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/insets.h"
 
 namespace views {
 
diff --git a/views/controls/label.cc b/views/controls/label.cc
index e661a61..8f0c536 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -12,12 +12,12 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/color_utils.h"
-#include "gfx/font.h"
-#include "gfx/insets.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/insets.h"
 #include "views/background.h"
 
 namespace views {
diff --git a/views/controls/label.h b/views/controls/label.h
index 8b27740..608b9cf 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include "base/gtest_prod_util.h"
-#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 7a1bf05..879bdc2 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 
diff --git a/views/controls/link.cc b/views/controls/link.cc
index e83411e..2c4dbab 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -9,13 +9,13 @@
 #endif
 
 #include "base/logging.h"
-#include "gfx/color_utils.h"
-#include "gfx/font.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/font.h"
 #include "views/event.h"
 
 #if defined(OS_LINUX)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #endif
 
 namespace {
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index 25a23d7..8e31ad7 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -8,9 +8,9 @@
 #include <windowsx.h>
 
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font.h"
 #include "views/controls/listbox/listbox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/listbox/native_listbox_wrapper.h b/views/controls/listbox/native_listbox_wrapper.h
index 19bd6ab..801bd6d 100644
--- a/views/controls/listbox/native_listbox_wrapper.h
+++ b/views/controls/listbox/native_listbox_wrapper.h
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_LISTBOX_NATIVE_LISTBOX_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
-#include "gfx/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 #include "views/controls/listbox/listbox.h"
 
 namespace views {
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index e005654..e3bb49b 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 #include "views/controls/menu/controller.h"
 
 class SkBitmap;
diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index 0fd9192..ae5446d 100644
--- a/views/controls/menu/menu_config.h
+++ b/views/controls/menu/menu_config.h
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 #pragma once
 
-#include "gfx/font.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index fbbaa37..8f1053d 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -10,8 +10,8 @@
 
 #include "base/logging.h"
 #include "base/win/win_util.h"
-#include "gfx/native_theme_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/gfx/native_theme_win.h"
 
 using gfx::NativeTheme;
 
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index af4c276..b670212 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -7,10 +7,10 @@
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h
index e054d0a..8de9266 100644
--- a/views/controls/menu/menu_host.h
+++ b/views/controls/menu/menu_host.h
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_MENU_MENU_HOST_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
-#include "gfx/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index a4b9779..68c7c9d 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -5,10 +5,10 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 23036a4..e87bb80 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -18,7 +18,7 @@
 #include "views/view.h"
 
 #if defined(OS_WIN)
-#include "gfx/native_theme_win.h"
+#include "ui/gfx/native_theme_win.h"
 #endif
 
 namespace ui {
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index e752ef2..956e546 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -5,11 +5,11 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/favicon_size.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/radio_button_image_gtk.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index f2ad60e..567acca 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -7,9 +7,9 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "gfx/canvas_skia.h"
-#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
 
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 6cdd158..61f8994 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -10,8 +10,8 @@
 #include <Vssym32.h>
 #endif
 
-#include "gfx/canvas_skia.h"
-#include "gfx/color_utils.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/color_utils.h"
 #include "views/border.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/menu/menu_config.h"
@@ -20,7 +20,7 @@
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
-#include "gfx/native_theme_win.h"
+#include "ui/gfx/native_theme_win.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/views/controls/menu/menu_separator_gtk.cc b/views/controls/menu/menu_separator_gtk.cc
index 628cd92..dd11884 100644
--- a/views/controls/menu/menu_separator_gtk.cc
+++ b/views/controls/menu/menu_separator_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/menu/menu_separator.h"
 
-#include "gfx/canvas.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/menu/menu_config.h"
 
 namespace views {
diff --git a/views/controls/menu/menu_separator_win.cc b/views/controls/menu/menu_separator_win.cc
index 3c74192..a34d1d2 100644
--- a/views/controls/menu/menu_separator_win.cc
+++ b/views/controls/menu/menu_separator_win.cc
@@ -8,8 +8,8 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "gfx/canvas_skia.h"
-#include "gfx/native_theme_win.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_item_view.h"
 
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 797489c..bf5cd4a 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -9,13 +9,13 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
-#include "gfx/rect.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/window_impl.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/rect.h"
 #include "views/accelerator.h"
 
 namespace views {
diff --git a/views/controls/menu/menu_wrapper.h b/views/controls/menu/menu_wrapper.h
index efcfd63..0816fc0 100644
--- a/views/controls/menu/menu_wrapper.h
+++ b/views/controls/menu/menu_wrapper.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_MENU_MENU_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index c75ac2f..f655e4c 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -12,12 +12,12 @@
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
-#include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #include "ui/base/models/menu_model.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/gtk_util.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/nested_dispatcher_gtk.h"
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index e7238a4..9eabf46 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -6,13 +6,13 @@
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
diff --git a/views/controls/menu/native_menu_x.cc b/views/controls/menu/native_menu_x.cc
index aca6776..9771dd5 100644
--- a/views/controls/menu/native_menu_x.cc
+++ b/views/controls/menu/native_menu_x.cc
@@ -6,8 +6,8 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/skia_util.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/skia_util.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/submenu_view.h"
 
diff --git a/views/controls/menu/radio_button_image_gtk.cc b/views/controls/menu/radio_button_image_gtk.cc
index 9ce9a38..e22fbc8 100644
--- a/views/controls/menu/radio_button_image_gtk.cc
+++ b/views/controls/menu/radio_button_image_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/menu/radio_button_image_gtk.h"
 
-#include "gfx/canvas_skia.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/gfx/canvas_skia.h"
 
 namespace {
 
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 63a4613..06b9841 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -4,7 +4,7 @@
 
 #include "views/controls/menu/submenu_view.h"
 
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
diff --git a/views/controls/menu/view_menu_delegate.h b/views/controls/menu/view_menu_delegate.h
index b3e4079..d02c32c 100644
--- a/views/controls/menu/view_menu_delegate.h
+++ b/views/controls/menu/view_menu_delegate.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc
index d2edcba..c3fc77e 100644
--- a/views/controls/native/native_view_host.cc
+++ b/views/controls/native/native_view_host.cc
@@ -5,7 +5,7 @@
 #include "views/controls/native/native_view_host.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 #include "views/controls/native/native_view_host_views.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/native/native_view_host.h b/views/controls/native/native_view_host.h
index f2cd272..11aa9fa 100644
--- a/views/controls/native/native_view_host.h
+++ b/views/controls/native/native_view_host.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/controls/native/native_view_host_gtk.h b/views/controls/native/native_view_host_gtk.h
index 11be9b5..17ccd7e 100644
--- a/views/controls/native/native_view_host_gtk.h
+++ b/views/controls/native/native_view_host_gtk.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
 namespace views {
diff --git a/views/controls/native/native_view_host_views.cc b/views/controls/native/native_view_host_views.cc
index 8a999ee..8d28bb0 100644
--- a/views/controls/native/native_view_host_views.cc
+++ b/views/controls/native/native_view_host_views.cc
@@ -5,7 +5,7 @@
 #include "views/controls/native/native_view_host_views.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc
index 737b6f9..88feac7 100644
--- a/views/controls/native/native_view_host_win.cc
+++ b/views/controls/native/native_view_host_win.cc
@@ -5,7 +5,7 @@
 #include "views/controls/native/native_view_host_win.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 3c303c2..5b643a6 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -12,12 +12,12 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "gfx/native_theme_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 136ffb8..f4c11ce 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -9,12 +9,12 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/color_utils.h"
-#include "gfx/font.h"
-#include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/insets.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/painter.h"
diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc
index 9f950fa..3a0fd65 100644
--- a/views/controls/resize_area.cc
+++ b/views/controls/resize_area.cc
@@ -8,7 +8,7 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_LINUX)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #endif
 
 namespace views {
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index e7e32c8..9fccb46 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -13,11 +13,11 @@
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/canvas.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index 7248200..9f5d7dd 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -8,12 +8,12 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "gfx/canvas.h"
 #include "skia/ext/skia_utils_win.h"
+#include "ui/gfx/canvas.h"
 #include "views/background.h"
 
 #if defined(OS_LINUX)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #endif
 
 namespace views {
diff --git a/views/controls/slider/native_slider_gtk.cc b/views/controls/slider/native_slider_gtk.cc
index 534b04a..ec490a8 100644
--- a/views/controls/slider/native_slider_gtk.cc
+++ b/views/controls/slider/native_slider_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "views/controls/slider/native_slider_gtk.h"
 
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #include "views/controls/slider/slider.h"
 
 namespace views {
diff --git a/views/controls/slider/native_slider_wrapper.h b/views/controls/slider/native_slider_wrapper.h
index 0c1d304..adfbf21 100644
--- a/views/controls/slider/native_slider_wrapper.h
+++ b/views/controls/slider/native_slider_wrapper.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 5aa88df..5172191 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -9,9 +9,9 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
-#include "gfx/font.h"
-#include "gfx/skia_utils_gtk.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/skia_utils_gtk.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/layout/fill_layout.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 6a370dc..93b1c80 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -8,11 +8,11 @@
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
-#include "gfx/native_theme_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/layout/fill_layout.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc
index cf35d73..0c70e74 100644
--- a/views/controls/table/group_table_view.cc
+++ b/views/controls/table/group_table_view.cc
@@ -7,7 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "gfx/canvas.h"
+#include "ui/gfx/canvas.h"
 
 namespace views {
 
diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc
index 99569995..87040bc 100644
--- a/views/controls/table/native_table_gtk.cc
+++ b/views/controls/table/native_table_gtk.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/gtk_util.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index a0291bb..bc40a55 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -8,14 +8,14 @@
 #include <windowsx.h>
 
 #include "base/logging.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/favicon_size.h"
-#include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/favicon_size.h"
+#include "ui/gfx/icon_util.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/table/native_table_wrapper.h b/views/controls/table/native_table_wrapper.h
index c81d32d6..f5232a0 100644
--- a/views/controls/table/native_table_wrapper.h
+++ b/views/controls/table/native_table_wrapper.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 using ui::TableColumn;
 
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 4bfd7749..df79b91 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -11,10 +11,6 @@
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/favicon_size.h"
-#include "gfx/font.h"
-#include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
@@ -23,6 +19,10 @@
 #include "ui/base/models/table_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/favicon_size.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/icon_util.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
 
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index 9d76bb2..679a6c8 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/native_table_wrapper.h"
 #include "views/view.h"
diff --git a/views/controls/textfield/gtk_views_entry.cc b/views/controls/textfield/gtk_views_entry.cc
index 9a2628b..caec272 100644
--- a/views/controls/textfield/gtk_views_entry.cc
+++ b/views/controls/textfield/gtk_views_entry.cc
@@ -5,9 +5,9 @@
 #include "views/controls/textfield/gtk_views_entry.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia_paint.h"
-#include "gfx/insets.h"
-#include "gfx/skia_utils_gtk.h"
+#include "ui/gfx/canvas_skia_paint.h"
+#include "ui/gfx/insets.h"
+#include "ui/gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/native_textfield_gtk.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/views/controls/textfield/gtk_views_textview.cc b/views/controls/textfield/gtk_views_textview.cc
index a2cc19f..a335072 100644
--- a/views/controls/textfield/gtk_views_textview.cc
+++ b/views/controls/textfield/gtk_views_textview.cc
@@ -5,9 +5,9 @@
 #include "views/controls/textfield/gtk_views_textview.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia_paint.h"
-#include "gfx/insets.h"
-#include "gfx/skia_utils_gtk.h"
+#include "ui/gfx/canvas_skia_paint.h"
+#include "ui/gfx/insets.h"
+#include "ui/gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/native_textfield_gtk.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index f713c4e..0b7cba1 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -9,9 +9,9 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/gtk_util.h"
-#include "gfx/insets.h"
-#include "gfx/skia_utils_gtk.h"
+#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/insets.h"
+#include "ui/gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/gtk_views_entry.h"
 #include "views/controls/textfield/gtk_views_textview.h"
 #include "views/controls/textfield/native_textfield_views.h"
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 37db36e..8b112e0 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -10,11 +10,11 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/insets.h"
 #include "grit/app_strings.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/insets.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/menu/menu_2.h"
@@ -24,7 +24,7 @@
 #include "views/views_delegate.h"
 
 #if defined(OS_LINUX)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #endif
 
 namespace {
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 1297710..5acbd03 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -8,8 +8,8 @@
 
 #include "base/string16.h"
 #include "base/task.h"
-#include "gfx/font.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/gfx/font.h"
 #include "views/border.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/view.h"
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 14c5317..222f722 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -10,7 +10,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
-#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/clipboard/clipboard.h"
@@ -19,6 +18,7 @@
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/gfx/native_theme_win.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index b0c8902..3ac0276 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -16,8 +16,8 @@
 #include <vsstyle.h>
 
 #include "base/win/scoped_comptr.h"
-#include "gfx/insets.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/gfx/insets.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/views/controls/textfield/native_textfield_wrapper.h
index e2ef2bd..efe24be 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/views/controls/textfield/native_textfield_wrapper.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/string16.h"
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Insets;
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index cbd6f52..dcd6061 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -12,8 +12,8 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/insets.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/insets.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 690e825..b0e6469 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -16,16 +16,16 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "gfx/font.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/font.h"
 #include "views/view.h"
 
 #if !defined(OS_LINUX)
 #include "base/logging.h"
 #endif
 #ifdef UNIT_TEST
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif
 
diff --git a/views/controls/textfield/textfield_views_model.cc b/views/controls/textfield/textfield_views_model.cc
index d9449d3..e63c28a 100644
--- a/views/controls/textfield/textfield_views_model.cc
+++ b/views/controls/textfield/textfield_views_model.cc
@@ -9,9 +9,9 @@
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
+#include "ui/gfx/font.h"
 #include "views/views_delegate.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/views/controls/textfield/textfield_views_model.h b/views/controls/textfield/textfield_views_model.h
index bcdc6bc..1e580b7 100644
--- a/views/controls/textfield/textfield_views_model.h
+++ b/views/controls/textfield/textfield_views_model.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/string16.h"
-#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/rect.h"
 
 namespace gfx {
 class Font;
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index 4a3e17e..f80b3b0 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -5,10 +5,10 @@
 #include "views/controls/throbber.h"
 
 #include "base/time.h"
-#include "gfx/canvas.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 3d81015..3f6b8bf 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -10,17 +10,17 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/win/win_util.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/canvas_skia_paint.h"
-#include "gfx/favicon_size.h"
-#include "gfx/icon_util.h"
-#include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas_skia_paint.h"
+#include "ui/gfx/favicon_size.h"
+#include "ui/gfx/icon_util.h"
+#include "ui/gfx/point.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index 43fc3d4..dd7c887 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -7,12 +7,12 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
 #include "views/controls/button/text_button.h"
 
 using ui::OSExchangeData;
diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc
index c87d771..b0b22c6 100644
--- a/views/drag_utils_gtk.cc
+++ b/views/drag_utils_gtk.cc
@@ -7,13 +7,13 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
-#include "gfx/gtk_util.h"
-#include "gfx/point.h"
-#include "gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/size.h"
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
diff --git a/views/drag_utils_win.cc b/views/drag_utils_win.cc
index 2a467b8..8a6f4ab 100644
--- a/views/drag_utils_win.cc
+++ b/views/drag_utils_win.cc
@@ -9,11 +9,11 @@
 #include <shobjidl.h>
 
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/gdi_util.h"
-#include "gfx/skbitmap_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/gdi_util.h"
+#include "ui/gfx/skbitmap_operations.h"
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderWin;
diff --git a/views/event.h b/views/event.h
index c893eeaf..51053ea 100644
--- a/views/event.h
+++ b/views/event.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "gfx/point.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/point.h"
 
 #if defined(OS_LINUX)
 typedef struct _GdkEventKey GdkEventKey;
diff --git a/views/focus/accelerator_handler_gtk_unittest.cc b/views/focus/accelerator_handler_gtk_unittest.cc
index 2fc93be..e7215ee 100644
--- a/views/focus/accelerator_handler_gtk_unittest.cc
+++ b/views/focus/accelerator_handler_gtk_unittest.cc
@@ -4,8 +4,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/view.h"
 #include "views/window/window_gtk.h"
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 6eee79d..6d41b6b 100644
--- a/views/focus/focus_manager.h
+++ b/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 "views/accelerator.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 2277964..bd21c16 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -8,10 +8,10 @@
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/gfx/rect.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
diff --git a/views/layout/box_layout.cc b/views/layout/box_layout.cc
index 6a6ede6..739d23e 100644
--- a/views/layout/box_layout.cc
+++ b/views/layout/box_layout.cc
@@ -4,8 +4,8 @@
 
 #include "views/layout/box_layout.h"
 
-#include "gfx/insets.h"
-#include "gfx/rect.h"
+#include "ui/gfx/insets.h"
+#include "ui/gfx/rect.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/layout/grid_layout.cc b/views/layout/grid_layout.cc
index e516779..971a033 100644
--- a/views/layout/grid_layout.cc
+++ b/views/layout/grid_layout.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "gfx/insets.h"
+#include "ui/gfx/insets.h"
 #include "views/layout/layout_constants.h"
 #include "views/view.h"
 
diff --git a/views/mouse_watcher.h b/views/mouse_watcher.h
index d23483d..f062c27 100644
--- a/views/mouse_watcher.h
+++ b/views/mouse_watcher.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "gfx/insets.h"
+#include "ui/gfx/insets.h"
 
 namespace views {
 
diff --git a/views/painter.cc b/views/painter.cc
index da73aa6..5a82bff 100644
--- a/views/painter.cc
+++ b/views/painter.cc
@@ -5,12 +5,12 @@
 #include "views/painter.h"
 
 #include "base/logging.h"
-#include "gfx/canvas.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/insets.h"
 
 namespace views {
 
diff --git a/views/screen.h b/views/screen.h
index 494f126..3e65b77 100644
--- a/views/screen.h
+++ b/views/screen.h
@@ -6,9 +6,9 @@
 #define VIEWS_SCREEN_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
-#include "gfx/point.h"
-#include "gfx/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/rect.h"
 
 namespace views {
 
diff --git a/views/view.cc b/views/view.cc
index 65fc624..2b23bb1 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -13,10 +13,10 @@
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/path.h"
 #include "views/background.h"
 #include "views/layout/layout_manager.h"
 #include "views/views_delegate.h"
diff --git a/views/view.h b/views/view.h
index d13fcbb..3ffd05f 100644
--- a/views/view.h
+++ b/views/view.h
@@ -16,9 +16,9 @@
 
 #include "base/i18n/rtl.h"
 #include "base/scoped_ptr.h"
-#include "gfx/native_widget_types.h"
-#include "gfx/rect.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 #include "views/accelerator.h"
 #include "views/accessibility/accessibility_types.h"
 #include "views/background.h"
diff --git a/views/view_text_utils.cc b/views/view_text_utils.cc
index 7aa9568..c75b8e4 100644
--- a/views/view_text_utils.cc
+++ b/views/view_text_utils.cc
@@ -8,9 +8,9 @@
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/color_utils.h"
-#include "gfx/size.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/size.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 
diff --git a/views/view_text_utils.h b/views/view_text_utils.h
index 6261f58..933d265 100644
--- a/views/view_text_utils.h
+++ b/views/view_text_utils.h
@@ -10,8 +10,8 @@
 
 #include <string>
 
-#include "gfx/rect.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/rect.h"
 
 namespace gfx {
 class Canvas;
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 6ce1be8..48a9f6f 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/path.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/path.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/views/view_win.cc b/views/view_win.cc
index fcdf44a..f95e9e0 100644
--- a/views/view_win.cc
+++ b/views/view_win.cc
@@ -10,9 +10,9 @@
 #include <oleacc.h>
 
 #include "base/string_util.h"
-#include "gfx/canvas.h"
-#include "gfx/path.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/border.h"
 #include "views/views_delegate.h"
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index c704a58..8a5caca 100644
--- a/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.cc
@@ -9,8 +9,8 @@
 #include <shlobj.h>
 
 #include "base/message_loop.h"
-#include "gfx/point.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/gfx/point.h"
 
 namespace views {
 
diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc
index fb8dafb..8ef8a9f 100644
--- a/views/widget/drop_target_gtk.cc
+++ b/views/widget/drop_target_gtk.cc
@@ -11,11 +11,11 @@
 
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/point.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
+#include "ui/gfx/point.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
diff --git a/views/widget/drop_target_win.cc b/views/widget/drop_target_win.cc
index fa49d97..7632f6a 100644
--- a/views/widget/drop_target_win.cc
+++ b/views/widget/drop_target_win.cc
@@ -4,10 +4,10 @@
 
 #include "views/widget/drop_target_win.h"
 
-#include "gfx/point.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "ui/gfx/point.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
diff --git a/views/widget/monitor_win.cc b/views/widget/monitor_win.cc
index 848adfa..8e60b90 100644
--- a/views/widget/monitor_win.cc
+++ b/views/widget/monitor_win.cc
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 #include "base/logging.h"
-#include "gfx/rect.h"
+#include "ui/gfx/rect.h"
 
 namespace views {
 
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index d9c1ae2..5ce171f 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -12,9 +12,9 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/gfx/canvas_skia.h"
 #include "views/focus/view_storage.h"
 #include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
@@ -23,7 +23,7 @@
 #if defined(TOUCH_UI)
 #include "views/touchui/gesture_manager.h"
 #if defined(HAVE_XINPUT2)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #include "views/touchui/touch_factory.h"
 #endif
 #endif
diff --git a/views/widget/root_view_gtk.cc b/views/widget/root_view_gtk.cc
index b2103e1..5edfd63 100644
--- a/views/widget/root_view_gtk.cc
+++ b/views/widget/root_view_gtk.cc
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "gfx/canvas_skia_paint.h"
+#include "ui/gfx/canvas_skia_paint.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index e9e858d..51f86a7 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -4,11 +4,11 @@
 
 #include "views/widget/root_view.h"
 
-#include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "ui/gfx/canvas_skia.h"
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderWin;
diff --git a/views/widget/tooltip_manager_gtk.cc b/views/widget/tooltip_manager_gtk.cc
index 8099272..9ff4436 100644
--- a/views/widget/tooltip_manager_gtk.cc
+++ b/views/widget/tooltip_manager_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 #include "views/focus/focus_manager.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc
index 854275e..95a87b1 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -10,8 +10,8 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "gfx/font.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/gfx/font.h"
 #include "views/screen.h"
 #include "views/view.h"
 #include "views/widget/monitor_win.h"
diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h
index 3bca4ef..add4531 100644
--- a/views/widget/tooltip_manager_win.h
+++ b/views/widget/tooltip_manager_win.h
@@ -12,9 +12,9 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "gfx/native_widget_types.h"
-#include "gfx/point.h"
 #include "base/task.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/point.h"
 #include "views/widget/tooltip_manager.h"
 
 namespace gfx {
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 2cc37f6..46f55d4 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Path;
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 9d3c359..d34415b 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -15,10 +15,10 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/path.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
+#include "ui/gfx/path.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index af66ea6..a7cf572 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -9,9 +9,9 @@
 #include <gtk/gtk.h>
 
 #include "base/message_loop.h"
-#include "gfx/size.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/x/active_window_watcher_x.h"
+#include "ui/gfx/size.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index a7731e5..d4e4267 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -8,15 +8,15 @@
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/native_theme_win.h"
-#include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/theme_provider.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 "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
 #include "views/focus/focus_util_win.h"
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index edc9acf..0645aee 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -5,13 +5,13 @@
 #include "views/window/custom_frame_view.h"
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
-#include "gfx/font.h"
-#include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "grit/app_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/path.h"
 #include "views/window/client_view.h"
 #include "views/window/window_shape.h"
 #include "views/window/window_delegate.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 8420ad8..6350d9d 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -15,21 +15,21 @@
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
 #include "grit/app_strings.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
 #include "views/controls/button/native_button.h"
 #include "views/layout/layout_constants.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
-#include "gfx/native_theme_win.h"
+#include "ui/gfx/native_theme_win.h"
 #else
-#include "gfx/skia_utils_gtk.h"
+#include "ui/gfx/skia_utils_gtk.h"
 #include "views/window/hit_test.h"
 #include "views/widget/widget.h"
 #endif
diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h
index fdc4693..1ac2fee 100644
--- a/views/window/dialog_client_view.h
+++ b/views/window/dialog_client_view.h
@@ -6,7 +6,7 @@
 #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 #pragma once
 
-#include "gfx/font.h"
+#include "ui/gfx/font.h"
 #include "views/focus/focus_manager.h"
 #include "views/controls/button/button.h"
 #include "views/window/client_view.h"
diff --git a/views/window/window.cc b/views/window/window.cc
index 7b175fe..ea6fcc1 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -5,10 +5,10 @@
 #include "views/window/window.h"
 
 #include "base/string_util.h"
-#include "gfx/font.h"
-#include "gfx/size.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/size.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/views/window/window.h b/views/window/window.h
index e8bd7c0..e083f68 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -6,7 +6,7 @@
 #define VIEWS_WINDOW_WINDOW_H_
 #pragma once
 
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Font;
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 962331d..09614f5 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -4,11 +4,11 @@
 
 #include "views/window/window_gtk.h"
 
-#include "gfx/rect.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/gtk_util.h"
-#include "gfx/path.h"
+#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/path.h"
+#include "ui/gfx/rect.h"
 #include "views/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
diff --git a/views/window/window_shape.cc b/views/window/window_shape.cc
index dd234bf..6f88ea4 100644
--- a/views/window/window_shape.cc
+++ b/views/window/window_shape.cc
@@ -4,8 +4,8 @@
 
 #include "views/window/window_shape.h"
 
-#include "gfx/path.h"
-#include "gfx/size.h"
+#include "ui/gfx/path.h"
+#include "ui/gfx/size.h"
 
 namespace views {
 
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index adf6946..fdca1e9 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -11,14 +11,14 @@
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
-#include "gfx/canvas_skia_paint.h"
-#include "gfx/font.h"
-#include "gfx/icon_util.h"
-#include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/canvas_skia_paint.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/icon_util.h"
+#include "ui/gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
diff --git a/views/window/window_win_unittest.cc b/views/window/window_win_unittest.cc
index 0e1f037..7cdc913 100644
--- a/views/window/window_win_unittest.cc
+++ b/views/window/window_win_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "views/window/window_win.h"
 
-#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
 
 namespace views {