9 files changed, 10 insertions, 10 deletions
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"