Move chrome_canvas to app/gfx

http://crbug.com/11387

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

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

31 files changed, 31 insertions, 32 deletions

diff --git a/chrome/views/background.cc b/chrome/views/background.cc
index 3a7d8fc..656d0a1 100644
--- a/chrome/views/background.cc
+++ b/chrome/views/background.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/background.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/painter.h"
 #include "chrome/views/view.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/chrome/views/border.cc b/chrome/views/border.cc
index 4be943f..ccc4185 100644
--- a/chrome/views/border.cc
+++ b/chrome/views/border.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/border.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/button/checkbox.cc b/chrome/views/controls/button/checkbox.cc
index d0ec64a..2b15938 100644
--- a/chrome/views/controls/button/checkbox.cc
+++ b/chrome/views/controls/button/checkbox.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/views/controls/button/checkbox.h"
 
-#include "chrome/common/gfx/chrome_canvas.h"
+#include "app/gfx/chrome_canvas.h"
 #include "chrome/views/controls/label.h"
 
 namespace views {
diff --git a/chrome/views/controls/button/image_button.cc b/chrome/views/controls/button/image_button.cc
index 8b5ec86..3b0df8c 100644
--- a/chrome/views/controls/button/image_button.cc
+++ b/chrome/views/controls/button/image_button.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/controls/button/image_button.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/throb_animation.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "skia/ext/image_operations.h"
 
 namespace views {
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index a4ad6aa..f7e7136 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/controls/button/menu_button.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc
index add909b..d175fd4 100644
--- a/chrome/views/controls/button/text_button.cc
+++ b/chrome/views/controls/button/text_button.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/controls/button/text_button.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/event.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/views/controls/combo_box.cc b/chrome/views/controls/combo_box.cc
index 375dd3a7..db6c86b 100644
--- a/chrome/views/controls/combo_box.cc
+++ b/chrome/views/controls/combo_box.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/views/controls/combo_box.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "base/gfx/rect.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 
 // Limit how small a combobox can be.
diff --git a/chrome/views/controls/hwnd_view.cc b/chrome/views/controls/hwnd_view.cc
index b6ff61b..379345c 100644
--- a/chrome/views/controls/hwnd_view.cc
+++ b/chrome/views/controls/hwnd_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/views/controls/hwnd_view.h"
 
-#include "chrome/common/gfx/chrome_canvas.h"
+#include "app/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
diff --git a/chrome/views/controls/image_view.cc b/chrome/views/controls/image_view.cc
index a3892a9..f377adc 100644
--- a/chrome/views/controls/image_view.cc
+++ b/chrome/views/controls/image_view.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/controls/image_view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc
index 5ef0381..e0acde8 100644
--- a/chrome/views/controls/label.cc
+++ b/chrome/views/controls/label.cc
@@ -6,11 +6,11 @@
 
 #include <math.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/insets.h"
 #include "chrome/common/gfx/text_elider.h"
diff --git a/chrome/views/controls/label_unittest.cc b/chrome/views/controls/label_unittest.cc
index b287c29..5a152c3 100644
--- a/chrome/views/controls/label_unittest.cc
+++ b/chrome/views/controls/label_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/border.h"
 #include "chrome/views/controls/label.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index ef398f4..c591a7e 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.cc
@@ -8,6 +8,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_drag_source.h"
@@ -18,7 +19,6 @@
 #include "base/win_util.h"
 // TODO(beng): (Cleanup) remove this browser dep.
 #include "chrome/browser/drag_utils.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/views/border.h"
diff --git a/chrome/views/controls/menu/menu.cc b/chrome/views/controls/menu/menu.cc
index e46eaa0..3e4e6ae 100644
--- a/chrome/views/controls/menu/menu.cc
+++ b/chrome/views/controls/menu/menu.cc
@@ -12,13 +12,13 @@
 #include <atlmisc.h>
 #include <string>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/accelerator.h"
 
diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
index da35a62..fbb0e99 100644
--- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/controls/menu/menu.h"
 #include "chrome/views/controls/scroll_view.h"
 #include "chrome/views/widget/widget.h"
diff --git a/chrome/views/controls/single_split_view.cc b/chrome/views/controls/single_split_view.cc
index 9f87310..a16a767 100644
--- a/chrome/views/controls/single_split_view.cc
+++ b/chrome/views/controls/single_split_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/views/controls/single_split_view.h"
 
-#include "chrome/common/gfx/chrome_canvas.h"
+#include "app/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
 #include "skia/ext/skia_utils_win.h"
 
diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc
index 75d7f03..e0205a9 100644
--- a/chrome/views/controls/tabbed_pane.cc
+++ b/chrome/views/controls/tabbed_pane.cc
@@ -6,12 +6,12 @@
 
 #include <vssym32.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/views/background.h"
 #include "chrome/views/fill_layout.h"
diff --git a/chrome/views/controls/table/group_table_view.cc b/chrome/views/controls/table/group_table_view.cc
index 7d65c32..5c87736 100644
--- a/chrome/views/controls/table/group_table_view.cc
+++ b/chrome/views/controls/table/group_table_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/controls/table/group_table_view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 
 namespace views {
 
diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc
index a794e91..ecb9773 100644
--- a/chrome/views/controls/table/table_view.cc
+++ b/chrome/views/controls/table/table_view.cc
@@ -7,11 +7,11 @@
 #include <algorithm>
 #include <windowsx.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc
index 5bf9ce5..de2a651 100644
--- a/chrome/views/controls/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/controls/throbber.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/time.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/logging_chrome.h"
 #include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index 13e1914d..e657658 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/chrome/views/controls/tree/tree_view.cc
@@ -6,12 +6,12 @@
 
 #include <shellapi.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/widget/widget.h"
diff --git a/chrome/views/painter.cc b/chrome/views/painter.cc
index bfddce5..464bba4 100644
--- a/chrome/views/painter.cc
+++ b/chrome/views/painter.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/painter.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "skia/include/SkBitmap.h"
 #include "skia/include/SkGradientShader.h"
 
diff --git a/chrome/views/view.cc b/chrome/views/view.cc
index 561ee70..22ab762 100644
--- a/chrome/views/view.cc
+++ b/chrome/views/view.cc
@@ -5,18 +5,17 @@
 #include "chrome/views/view.h"
 
 #include <algorithm>
-
 #ifndef NDEBUG
 #include <iostream>
 #endif
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
 #include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
 #include "chrome/views/layout_manager.h"
 #include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc
index f38a5ee..ad14e81 100644
--- a/chrome/views/view_unittest.cc
+++ b/chrome/views/view_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/chrome_canvas.h"
 #include "base/clipboard.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/background.h"
diff --git a/chrome/views/view_win.cc b/chrome/views/view_win.cc
index 5efdb99..41e97a9 100644
--- a/chrome/views/view_win.cc
+++ b/chrome/views/view_win.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
 #include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/views/accessibility/view_accessibility_wrapper.h"
diff --git a/chrome/views/widget/root_view.cc b/chrome/views/widget/root_view.cc
index f8135bb..8d7b047 100644
--- a/chrome/views/widget/root_view.cc
+++ b/chrome/views/widget/root_view.cc
@@ -6,13 +6,13 @@
 
 #include <algorithm>
 
+#include "app/gfx/chrome_canvas.h"
 #if defined(OS_WIN)
 #include "base/base_drag_source.h"
 #endif
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/common/drag_drop_types.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/notification_service.h"
 #if defined(OS_WIN)
 #include "chrome/views/widget/root_view_drop_target.h"
diff --git a/chrome/views/widget/root_view_gtk.cc b/chrome/views/widget/root_view_gtk.cc
index 241e042..68d0947 100644
--- a/chrome/views/widget/root_view_gtk.cc
+++ b/chrome/views/widget/root_view_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/views/widget/root_view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "skia/include/SkColor.h"
 
 namespace views {
diff --git a/chrome/views/widget/root_view_win.cc b/chrome/views/widget/root_view_win.cc
index 1beff61..17efd54 100644
--- a/chrome/views/widget/root_view_win.cc
+++ b/chrome/views/widget/root_view_win.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/widget/root_view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/base_drag_source.h"
 #include "base/logging.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/views/widget/root_view_drop_target.h"
 
diff --git a/chrome/views/widget/widget_win.cc b/chrome/views/widget/widget_win.cc
index 3de8958..0bb3e78 100644
--- a/chrome/views/widget/widget_win.cc
+++ b/chrome/views/widget/widget_win.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/views/widget/widget_win.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/accessibility/view_accessibility.h"
diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc
index e6524de..e3cdad6 100644
--- a/chrome/views/window/custom_frame_view.cc
+++ b/chrome/views/window/custom_frame_view.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/views/window/custom_frame_view.h"
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/common/gfx/path.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/window/client_view.h"
diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc
index f60bd26..099ff60 100644
--- a/chrome/views/window/dialog_client_view.cc
+++ b/chrome/views/window/dialog_client_view.cc
@@ -8,11 +8,11 @@
 #include <uxtheme.h>
 #include <vsstyle.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/controls/button/native_button.h"
diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc
index 0057177..9a603f9 100644
--- a/chrome/views/window/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -6,11 +6,11 @@
 
 #include <shellapi.h>
 
+#include "app/gfx/chrome_canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/gfx/path.h"