From cd81841e8ec6c2d1ace04df2e04b651c7a902242 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 19 Mar 2010 03:23:15 +0000
Subject: Move more files to toplevel gfx.

TBR=darin
BUG=none
TEST=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42071 0039d316-1c4b-4281-b951-d872f2087c98
---
 views/controls/menu/menu_config_win.cc            | 4 ++--
 views/controls/menu/menu_item_view_gtk.cc         | 2 +-
 views/controls/menu/menu_item_view_win.cc         | 2 +-
 views/controls/menu/menu_scroll_view_container.cc | 4 ++--
 views/controls/menu/menu_separator_win.cc         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'views/controls/menu')

diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index f242f8c..155f86a 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -8,10 +8,10 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/gfx/native_theme_win.h"
-#include "base/logging.h"
 #include "app/l10n_util_win.h"
+#include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 
 using gfx::NativeTheme;
 
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 33e5ff4..1e8745a 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -5,8 +5,8 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/resource_bundle.h"
+#include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index a2f31fb..f3b8123 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -9,8 +9,8 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
+#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 25817e4..df6e835 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -11,7 +11,7 @@
 #endif
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
+#include "gfx/color_utils.h"
 #include "views/border.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
@@ -19,7 +19,7 @@
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/views/controls/menu/menu_separator_win.cc b/views/controls/menu/menu_separator_win.cc
index 7273a0a..fdca5e3 100644
--- a/views/controls/menu/menu_separator_win.cc
+++ b/views/controls/menu/menu_separator_win.cc
@@ -9,7 +9,7 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_item_view.h"
 
-- 
cgit v1.1