Move some more files to toplevel gfx dir.

TBR=darin
BUG=none
TEST=none


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

19 files changed, 20 insertions, 20 deletions

diff --git a/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h
index 55dc302..3e50a46 100644
--- a/views/controls/button/native_button_wrapper.h
+++ b/views/controls/button/native_button_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_wrapper.h b/views/controls/combobox/native_combobox_wrapper.h
index d83e929..d2e96ad 100644
--- a/views/controls/combobox/native_combobox_wrapper.h
+++ b/views/controls/combobox/native_combobox_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 #define VIEWS_CONTROLS_COMBOBOX_NATIVE_COMBOBOX_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace gfx{
 class Size;
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 14a6219..c215740 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -5,8 +5,8 @@
 #include "views/controls/image_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/insets.h"
 #include "base/logging.h"
+#include "gfx/insets.h"
 
 namespace views {
 
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 43e5988..3a93822 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -10,12 +10,12 @@
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
-#include "app/gfx/insets.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/insets.h"
 #include "views/background.h"
 
 namespace views {
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index 624376c..c0c36c7 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -5,8 +5,8 @@
 #ifndef CONTROLS_MENU_VIEWS_MENU_H_
 #define CONTROLS_MENU_VIEWS_MENU_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
+#include "gfx/native_widget_types.h"
 #include "views/controls/menu/controller.h"
 
 class SkBitmap;
diff --git a/views/controls/menu/menu_wrapper.h b/views/controls/menu/menu_wrapper.h
index 65d75ce..b985387 100644
--- a/views/controls/menu/menu_wrapper.h
+++ b/views/controls/menu/menu_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_MENU_MENU_WRAPPER_H_
 #define VIEWS_CONTROLS_MENU_MENU_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index b222229..300ef2c6 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "app/gfx/font.h"
-#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/menus/menu_model.h"
 #include "base/keyboard_code_conversion_gtk.h"
@@ -17,6 +16,7 @@
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/gtk_util.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/view_menu_delegate.h b/views/controls/menu/view_menu_delegate.h
index 9a3a447..98f0156 100644
--- a/views/controls/menu/view_menu_delegate.h
+++ b/views/controls/menu/view_menu_delegate.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_VIEW_MENU_DELEGATE_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace gfx {
 class Point;
diff --git a/views/controls/native/native_view_host.h b/views/controls/native/native_view_host.h
index 5a9a403..149e9ae 100644
--- a/views/controls/native/native_view_host.h
+++ b/views/controls/native/native_view_host.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 1f5cba1..40cc814 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -9,11 +9,11 @@
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
-#include "app/gfx/insets.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.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/slider/native_slider_gtk.cc b/views/controls/slider/native_slider_gtk.cc
index a394d70..534b04a 100644
--- a/views/controls/slider/native_slider_gtk.cc
+++ b/views/controls/slider/native_slider_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "views/controls/slider/native_slider_gtk.h"
 
-#include "app/gfx/gtk_util.h"
+#include "gfx/gtk_util.h"
 #include "views/controls/slider/slider.h"
 
 namespace views {
diff --git a/views/controls/slider/native_slider_wrapper.h b/views/controls/slider/native_slider_wrapper.h
index bca3bde..6df3145 100644
--- a/views/controls/slider/native_slider_wrapper.h
+++ b/views/controls/slider/native_slider_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
 #define VIEWS_CONTROLS_SLIDER_NATIVE_SLIDER_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/table/native_table_gtk.cc b/views/controls/table/native_table_gtk.cc
index ca8813b..b2dce54 100644
--- a/views/controls/table/native_table_gtk.cc
+++ b/views/controls/table/native_table_gtk.cc
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "app/gfx/gtk_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
diff --git a/views/controls/table/native_table_wrapper.h b/views/controls/table/native_table_wrapper.h
index a4a6cbf..58cf977 100644
--- a/views/controls/table/native_table_wrapper.h
+++ b/views/controls/table/native_table_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_
 #define VIEWS_CONTROLS_TABLE_NATIVE_TABLE_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 9baa017..6f3d3ca 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/insets.h"
-#include "app/gfx/gtk_util.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 "views/controls/textfield/textfield.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index a5fb887..8025597 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -13,9 +13,9 @@
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
-#include "app/gfx/insets.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_comptr_win.h"
+#include "gfx/insets.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/views/controls/textfield/native_textfield_wrapper.h
index c9cddcd..49d7a0e 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/views/controls/textfield/native_textfield_wrapper.h
@@ -5,8 +5,8 @@
 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "base/string16.h"
+#include "gfx/native_widget_types.h"
 
 namespace gfx {
 class Insets;
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index e12138e..b650530 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -8,9 +8,9 @@
 #include <gdk/gdkkeysyms.h>
 #endif
 
-#include "app/gfx/insets.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
+#include "gfx/insets.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 3810d82..bccd07e 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -17,7 +17,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif