12 files changed, 14 insertions, 14 deletions
diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index a502b8a..eafbed1 100644
--- a/views/controls/menu/menu_config.h
+++ b/views/controls/menu/menu_config.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index a1fd9ad..625199d 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -4,12 +4,12 @@
 
 #include "views/controls/menu/menu_controller.h"
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"
+#include "gfx/canvas.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_item_view.cc b/views/controls/menu/menu_item_view.cc
index 95e22d0..62243e7 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/menu/menu_item_view.h"
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
+#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 1e8745a..9b2095c 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/menu/menu_item_view.h"
 
-#include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/text_button.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index f3b8123..489fe90 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -8,8 +8,8 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
+#include "gfx/canvas.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index df6e835..efd47ca 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -10,7 +10,7 @@
 #include <Vssym32.h>
 #endif
 
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "views/border.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_separator_gtk.cc b/views/controls/menu/menu_separator_gtk.cc
index d0b7fba..628cd92 100644
--- a/views/controls/menu/menu_separator_gtk.cc
+++ b/views/controls/menu/menu_separator_gtk.cc
@@ -4,7 +4,7 @@
 
 #include "views/controls/menu/menu_separator.h"
 
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/controls/menu/menu_config.h"
 
diff --git a/views/controls/menu/menu_separator_win.cc b/views/controls/menu/menu_separator_win.cc
index fdca5e3..58e2bb4 100644
--- a/views/controls/menu/menu_separator_win.cc
+++ b/views/controls/menu/menu_separator_win.cc
@@ -8,7 +8,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "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 01eed94..b941788 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win/window_impl.h"
@@ -15,6 +13,8 @@
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 #include "views/accelerator.h"
 
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index f551ed6..a910a76 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -8,7 +8,6 @@
 #include <map>
 #include <string>
 
-#include "app/gfx/font.h"
 #include "app/menus/menu_model.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_code_conversion_gtk.h"
@@ -16,6 +15,7 @@
 #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 "views/accelerator.h"
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index 75b8d4c..3470e27 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -4,13 +4,13 @@
 
 #include "views/controls/menu/native_menu_win.h"
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 14aae44..8136794 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 "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"