Move app/gfx/canvas and app/gfx/font to gfx/.

TBR=darin
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1132006

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

38 files changed, 46 insertions, 46 deletions

diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index ac756cd..f1ae320 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/button/checkbox.h"
 
-#include "app/gfx/canvas.h"
 #include "base/logging.h"
+#include "gfx/canvas.h"
 #include "views/controls/label.h"
 
 namespace views {
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index e12dab2..245942a 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/button/image_button.h"
 
-#include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
+#include "gfx/canvas.h"
 #include "gfx/skbitmap_operations.h"
 
 namespace views {
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 4c9f0fe..4a1e28a 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -5,9 +5,9 @@
 #include "views/controls/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/button.h"
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 57f42a0..3895b03 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "app/gfx/font.h"
 #include "base/time.h"
+#include "gfx/font.h"
 #include "views/background.h"
 #include "views/controls/button/text_button.h"
 
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h
index f69b2b6..4b6d06f 100644
--- a/views/controls/button/native_button.h
+++ b/views/controls/button/native_button.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/native_button_wrapper.h"
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index ca0954d..2442d31 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
-#include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
+#include "gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h
index b6bd739..f59b2a7 100644
--- a/views/controls/button/text_button.h
+++ b/views/controls/button/text_button.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/border.h"
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index c95520e..13f1912 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -5,10 +5,10 @@
 #include "views/controls/combobox/native_combobox_win.h"
 
 #include "app/combobox_model.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
+#include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index c215740..4217fe1 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/image_view.h"
 
-#include "app/gfx/canvas.h"
 #include "base/logging.h"
+#include "gfx/canvas.h"
 #include "gfx/insets.h"
 
 namespace views {
diff --git a/views/controls/label.cc b/views/controls/label.cc
index e4f61fa..3a21509 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -7,15 +7,15 @@
 #include <math.h>
 #include <limits>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "gfx/insets.h"
 #include "views/background.h"
 
diff --git a/views/controls/label.h b/views/controls/label.h
index 2249a82..23ba9ee 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -5,7 +5,7 @@
 #ifndef VIEWS_CONTROLS_LABEL_H_
 #define VIEWS_CONTROLS_LABEL_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 05c204c..a283333 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/border.h"
 #include "views/controls/label.h"
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 72d5c29..bf90fea 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -8,10 +8,10 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "app/gfx/font.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "views/event.h"
 
 namespace {
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"
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc
index 463f149..bf6dd7f 100644
--- a/views/controls/native/native_view_host.cc
+++ b/views/controls/native/native_view_host.cc
@@ -5,7 +5,7 @@
 #include "views/controls/native/native_view_host.h"
 
 #include "base/logging.h"
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc
index 75045ab..87c6c3b 100644
--- a/views/controls/native/native_view_host_win.cc
+++ b/views/controls/native/native_view_host_win.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/native/native_view_host_win.h"
 
-#include "app/gfx/canvas.h"
 #include "base/logging.h"
+#include "gfx/canvas.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 3ef04ab..4c0cb33 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -6,13 +6,13 @@
 
 #include <string>
 
-#include "app/gfx/canvas.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/canvas.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index bccf9a1..d5ac40c 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -8,12 +8,12 @@
 #include "views/screen.h"
 #endif
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
+#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/menu.h"
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index 10dc967..73feef2 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -8,7 +8,7 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "skia/ext/skia_utils_win.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 dfe1e29..8900de3 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -6,12 +6,12 @@
 
 #include <gtk/gtk.h>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/skia_utils_gtk.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index a835e05..7426f72 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -6,12 +6,12 @@
 
 #include <vssym32.h>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
diff --git a/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc
index 84573a9..14a5eae 100644
--- a/views/controls/table/group_table_view.cc
+++ b/views/controls/table/group_table_view.cc
@@ -4,10 +4,10 @@
 
 #include "views/controls/table/group_table_view.h"
 
-#include "app/gfx/canvas.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
+#include "gfx/canvas.h"
 
 namespace views {
 
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index e030dbf..f0a212f 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -7,12 +7,12 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
-#include "app/gfx/canvas.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/canvas.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 3d1acd1..711a707 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -9,8 +9,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
@@ -18,7 +16,9 @@
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
+#include "gfx/font.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/textfield.h b/views/controls/textfield/textfield.h
index 71bdf49..eed9feb 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -11,10 +11,10 @@
 
 #include <string>
 
-#include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/string16.h"
+#include "gfx/font.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
 
diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc
index 2a4e324..bc5fa04 100644
--- a/views/controls/throbber.cc
+++ b/views/controls/throbber.cc
@@ -4,9 +4,9 @@
 
 #include "views/controls/throbber.h"
 
-#include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
+#include "gfx/canvas.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index f70ac17..f5afcce 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -6,8 +6,6 @@
 
 #include <vector>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
@@ -15,6 +13,8 @@
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
+#include "gfx/canvas.h"
+#include "gfx/canvas_paint.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "gfx/point.h"