7 files changed, 9 insertions, 9 deletions
diff --git a/chrome/plugin/command_buffer_stub.h b/chrome/plugin/command_buffer_stub.h
index e9f65c6..96974ab 100644
--- a/chrome/plugin/command_buffer_stub.h
+++ b/chrome/plugin/command_buffer_stub.h
@@ -10,12 +10,12 @@
 
 #include "app/surface/transport_dib.h"
 #include "base/ref_counted.h"
-#include "gfx/native_widget_types.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/gpu_processor.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
+#include "ui/gfx/native_widget_types.h"
 
 class PluginChannel;
 
diff --git a/chrome/plugin/npobject_proxy.h b/chrome/plugin/npobject_proxy.h
index 4b6b595..253eb14 100644
--- a/chrome/plugin/npobject_proxy.h
+++ b/chrome/plugin/npobject_proxy.h
@@ -11,10 +11,10 @@
 
 #include "base/ref_counted.h"
 #include "chrome/plugin/npobject_base.h"
-#include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npruntime.h"
+#include "ui/gfx/native_widget_types.h"
 
 class PluginChannelBase;
 struct NPObject;
diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h
index d43fbad..708648a 100644
--- a/chrome/plugin/npobject_stub.h
+++ b/chrome/plugin/npobject_stub.h
@@ -14,9 +14,9 @@
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "chrome/plugin/npobject_base.h"
-#include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
+#include "ui/gfx/native_widget_types.h"
 
 class PluginChannelBase;
 struct NPIdentifier_Param;
diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h
index d1a1a1c..c8d5e84 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/chrome/plugin/plugin_channel_base.h
@@ -15,9 +15,9 @@
 #include "base/scoped_ptr.h"
 #include "chrome/common/message_router.h"
 #include "chrome/plugin/npobject_base.h"
-#include "gfx/native_widget_types.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
+#include "ui/gfx/native_widget_types.h"
 
 // Encapsulates an IPC channel between a renderer and a plugin process.
 class PluginChannelBase : public IPC::Channel::Listener,
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 099d4e3..76f3a69 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -34,7 +34,7 @@
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #endif
 
 #if defined(USE_X11)
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index ce99e77..e769a84 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -13,10 +13,10 @@
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "chrome/plugin/command_buffer_stub.h"
-#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npapi.h"
+#include "ui/gfx/rect.h"
 
 class PluginChannel;
 class WebPluginProxy;
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 8f671b9..d471f80 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -17,10 +17,10 @@
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
-#include "gfx/blit.h"
-#include "gfx/canvas.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
+#include "ui/gfx/blit.h"
+#include "ui/gfx/canvas.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(OS_MACOSX)
@@ -31,7 +31,7 @@
 
 #if defined(OS_WIN)
 #include "chrome/common/section_util_win.h"
-#include "gfx/gdi_util.h"
+#include "ui/gfx/gdi_util.h"
 #endif
 
 #if defined(USE_X11)