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

18 files changed, 21 insertions, 20 deletions

diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 636a8fd..e12dab2 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -5,8 +5,8 @@
 #include "views/controls/button/image_button.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/throb_animation.h"
+#include "gfx/skbitmap_operations.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index ccee133..69ca8a3 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -6,9 +6,9 @@
 
 #include "app/combobox_model.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 3a93822..4ba457b 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -8,13 +8,13 @@
 #include <limits>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "gfx/insets.h"
 #include "views/background.h"
 
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 80172e2..72d5c29 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -8,10 +8,10 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
+#include "gfx/color_utils.h"
 #include "views/event.h"
 
 namespace {
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"
 
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index f6b1d75..347406f 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -10,11 +10,11 @@
 #include <atlframe.h>
 #include <atlmisc.h>
 
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util_win.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 053c16d..3ef04ab 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -7,12 +7,13 @@
 #include <string>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "gfx/color_utils.h"
+#include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "views/background.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 0d20c03..dfe1e29 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/skia_utils_gtk.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/skia_utils_gtk.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 48df2e8..a835e05 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index e683553..e030dbf 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -8,12 +8,12 @@
 #include <windowsx.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/table_model.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/table/table_view2.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index f944d22..6122e44 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -10,7 +10,6 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ -18,6 +17,7 @@
 #include "app/table_model.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 6f3d3ca..5580786 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -6,11 +6,11 @@
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
-#include "app/gfx/skia_utils_gtk.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/gtk_util.h"
 #include "gfx/insets.h"
+#include "gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/textfield.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index bdf9eec..a405430 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -8,13 +8,13 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/menu/menu_win.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index cb733d8..7cf1e8f 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -8,13 +8,13 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/canvas_paint.h"
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"