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

37 files changed, 39 insertions, 38 deletions

diff --git a/views/border.h b/views/border.h
index 78b64dd..34f40fc 100644
--- a/views/border.h
+++ b/views/border.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_BORDER_H_
 #define VIEWS_BORDER_H_
 
-#include "app/gfx/insets.h"
+#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/view.h"
 
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
 
diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc
index e715258..a119d8f 100644
--- a/views/drag_utils_gtk.cc
+++ b/views/drag_utils_gtk.cc
@@ -7,10 +7,10 @@
 #include <gtk/gtk.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/gtk_util.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_gtk.h"
 #include "base/logging.h"
+#include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "gfx/size.h"
 
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 00e7a0a..bad9dba 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -9,9 +9,9 @@
 #include <map>
 #include <vector>
 
-#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/singleton.h"
+#include "gfx/native_widget_types.h"
 #include "views/accelerator.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
diff --git a/views/grid_layout.cc b/views/grid_layout.cc
index e2b00b1..19021fb 100644
--- a/views/grid_layout.cc
+++ b/views/grid_layout.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "app/gfx/insets.h"
+#include "gfx/insets.h"
 #include "views/standard_layout.h"
 #include "views/view.h"
 
diff --git a/views/painter.cc b/views/painter.cc
index 6c67f9e..df17ce9 100644
--- a/views/painter.cc
+++ b/views/painter.cc
@@ -5,9 +5,9 @@
 #include "views/painter.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/insets.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "gfx/insets.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
diff --git a/views/screen.h b/views/screen.h
index 45f3727..4fd60b9 100644
--- a/views/screen.h
+++ b/views/screen.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_SCREEN_H_
 #define VIEWS_SCREEN_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 
diff --git a/views/view.cc b/views/view.cc
index abc2957..b5e7173 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -11,12 +11,12 @@
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
diff --git a/views/view.h b/views/view.h
index 04eecc9..f83793b 100644
--- a/views/view.h
+++ b/views/view.h
@@ -13,9 +13,9 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/native_widget_types.h"
 #include "app/os_exchange_data.h"
 #include "base/scoped_ptr.h"
+#include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "views/accelerator.h"
 #include "views/accessibility/accessibility_types.h"
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 1e993d0..eb2d4bc 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/path.h"
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "gfx/path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
diff --git a/views/view_win.cc b/views/view_win.cc
index a92cf68..0d4ccb1 100644
--- a/views/view_win.cc
+++ b/views/view_win.cc
@@ -6,8 +6,8 @@
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/path.h"
 #include "base/string_util.h"
+#include "gfx/path.h"
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/border.h"
 #include "views/widget/root_view.h"
diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h
index 6865095..e945031 100644
--- a/views/widget/tooltip_manager_win.h
+++ b/views/widget/tooltip_manager_win.h
@@ -9,8 +9,8 @@
 #include <commctrl.h>
 #include <string>
 
-#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
+#include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 #include "base/task.h"
 #include "views/widget/tooltip_manager.h"
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 3f537f6..b57a701 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -6,7 +6,8 @@
 #define VIEWS_WIDGET_WIDGET_H_
 
 #include <vector>
-#include "app/gfx/native_widget_types.h"
+
+#include "gfx/native_widget_types.h"
 
 class ThemeProvider;
 
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index ac78404..8f98c10 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/path.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_gtk.h"
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/path.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 8a83299..a1be5ee 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -6,12 +6,12 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/native_theme_win.h"
-#include "app/gfx/path.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/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
 #include "views/focus/focus_util_win.h"
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 10a0559..e45b998 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -6,13 +6,13 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/path.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
+#include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
diff --git a/views/window/window.h b/views/window/window.h
index d322d8f..c0148bf 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_WINDOW_WINDOW_H_
 #define VIEWS_WINDOW_WINDOW_H_
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 namespace gfx {
 class Font;
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 171f222..38e0d82 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -4,10 +4,10 @@
 
 #include "views/window/window_gtk.h"
 
-#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "gfx/rect.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/path.h"
 #include "views/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index aa5555a..9a8cdcb 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -9,13 +9,13 @@
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/font.h"
-#include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "app/win_util.h"
 #include "base/win_util.h"
 #include "gfx/icon_util.h"
+#include "gfx/path.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
 #include "views/window/custom_frame_view.h"