Move app/gfx/canvas and app/gfx/font to gfx/.

TBR=darin
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1132006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42312 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
index 2093fda..bffadd5 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/canvas_paint.h"
 #include "app/x11_util.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_theme_provider.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "gfx/canvas_paint.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkShader.h"
 
diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
index 2da74ea..2eafca2 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
@@ -7,11 +7,11 @@
 
 #include <gtk/gtk.h>
 
-#include "app/gfx/canvas.h"
 #include "app/slide_animation.h"
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "gfx/canvas.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 87b48e1..16a823d 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/throb_animation.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/canvas_paint.h"
 #include "gfx/favicon_size.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
index 528a091..912b329 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
@@ -9,14 +9,14 @@
 #include <map>
 
 #include "app/animation.h"
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/slide_animation.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index e7e2ac6..1894d16 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/canvas_paint.h"
 #include "app/gtk_dnd_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
+#include "gfx/canvas_paint.h"
 #include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"