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

6 files changed, 6 insertions, 6 deletions

diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 5a8bb74..fcfdf4f 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -7,10 +7,10 @@
 #include <algorithm>
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/canvas.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "gfx/canvas.h"
 #include "views/fill_layout.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/widget.h"
diff --git a/views/widget/root_view_gtk.cc b/views/widget/root_view_gtk.cc
index e284313..75438fb 100644
--- a/views/widget/root_view_gtk.cc
+++ b/views/widget/root_view_gtk.cc
@@ -6,8 +6,8 @@
 
 #include <gtk/gtk.h>
 
-#include "app/gfx/canvas_paint.h"
 #include "base/logging.h"
+#include "gfx/canvas_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 65aa1b7..9535fd8 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -5,11 +5,11 @@
 #include "views/widget/root_view.h"
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
 #include "base/base_drag_source.h"
 #include "base/logging.h"
+#include "gfx/canvas_paint.h"
 
 namespace views {
 
diff --git a/views/widget/tooltip_manager_gtk.cc b/views/widget/tooltip_manager_gtk.cc
index 5358173..255f1ca 100644
--- a/views/widget/tooltip_manager_gtk.cc
+++ b/views/widget/tooltip_manager_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "views/widget/tooltip_manager_gtk.h"
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "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 137d32c..a8285da 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -7,13 +7,13 @@
 #include <windowsx.h>
 #include <limits>
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "gfx/font.h"
 #include "views/screen.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 1f574e2..99e6395 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -4,12 +4,12 @@
 
 #include "views/widget/widget_win.h"
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util_win.h"
 #include "app/system_monitor.h"
 #include "app/win_util.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/canvas.h"
 #include "gfx/native_theme_win.h"
 #include "gfx/path.h"
 #include "views/accessibility/view_accessibility.h"