diff options
88 files changed, 106 insertions, 103 deletions
diff --git a/app/app.vcproj b/app/app.vcproj index c4c489c..e4e2162 100644 --- a/app/app.vcproj +++ b/app/app.vcproj @@ -121,6 +121,22 @@ <References>
</References>
<Files>
+ <Filter
+ Name="gfx"
+ >
+ <File
+ RelativePath=".\gfx\chrome_canvas.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\gfx\chrome_canvas.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gfx\chrome_canvas_win.cc"
+ >
+ </File>
+ </Filter>
<File
RelativePath=".\animation.cc"
>
diff --git a/chrome/common/gfx/chrome_canvas.cc b/app/gfx/chrome_canvas.cc index 328bf65..886a170 100644 --- a/chrome/common/gfx/chrome_canvas.cc +++ b/app/gfx/chrome_canvas.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include <limits> diff --git a/chrome/common/gfx/chrome_canvas.h b/app/gfx/chrome_canvas.h index 72db8a5..3f2932a 100644 --- a/chrome/common/gfx/chrome_canvas.h +++ b/app/gfx/chrome_canvas.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_GFX_CHROME_CANVAS_H_ -#define CHROME_COMMON_GFX_CHROME_CANVAS_H_ +#ifndef APP_GFX_CHROME_CANVAS_H_ +#define APP_GFX_CHROME_CANVAS_H_ #if defined(OS_WIN) #include <windows.h> @@ -214,4 +214,4 @@ class ChromeCanvas : public skia::PlatformCanvas { typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint; #endif -#endif // CHROME_COMMON_GFX_CHROME_CANVAS_H_ +#endif // APP_GFX_CHROME_CANVAS_H_ diff --git a/chrome/common/gfx/chrome_canvas_linux.cc b/app/gfx/chrome_canvas_linux.cc index 5f8b430..5f8b430 100644 --- a/chrome/common/gfx/chrome_canvas_linux.cc +++ b/app/gfx/chrome_canvas_linux.cc diff --git a/chrome/common/gfx/chrome_canvas_win.cc b/app/gfx/chrome_canvas_win.cc index aefb640..4a4cd6a 100644 --- a/chrome/common/gfx/chrome_canvas_win.cc +++ b/app/gfx/chrome_canvas_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include <limits> diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 55ce530..285b8ab 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" @@ -17,7 +18,6 @@ #include "base/sys_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "unicode/uscript.h" // TODO(playmobil): remove this undef once SkPostConfig.h is fixed. diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 53fd027..70df68c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -6,6 +6,7 @@ #include <locale> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/base_drag_source.h" @@ -32,7 +33,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/location_bar_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/utils.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc index 9bf4cb9..65b4f34 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc @@ -11,6 +11,7 @@ #include <atlmisc.h> #include <cmath> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -27,7 +28,6 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/notification_service.h" #include "chrome/views/view.h" diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index 003e3d2..cfd53a8 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/debugger/debugger_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/controls/scroll_view.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 8b16539..b5269d1 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -8,6 +8,7 @@ #include "chrome/browser/download/download_util.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" @@ -18,7 +19,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/drag_utils.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index d85d080..2cef2ec 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -8,6 +8,7 @@ #include <shlobj.h> #include <shobjidl.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -15,7 +16,6 @@ #include "base/gfx/point.h" #include "base/string_util.h" #include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index 81f2688..4d576a2 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -8,10 +8,10 @@ #include <gtk/gtk.h> #include "app/animation.h" +#include "app/gfx/chrome_canvas.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/gfx/rect.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/owned_widget_gtk.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index b4987a5..15d1950 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -13,7 +14,6 @@ #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/renderer_host/render_widget_host_unittest.cc b/chrome/browser/renderer_host/render_widget_host_unittest.cc index cea36c9..1d0c205 100644 --- a/chrome/browser/renderer_host/render_widget_host_unittest.cc +++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc @@ -2,6 +2,7 @@ // 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/basictypes.h" #include "base/keyboard_codes.h" #include "base/scoped_ptr.h" @@ -9,7 +10,6 @@ #include "build/build_config.h" #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/test_render_view_host.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/render_messages.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 75a2b03..31fc946 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -22,7 +23,6 @@ #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc index a1805a1..8ea2160 100644 --- a/chrome/browser/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/tab_contents/tab_contents_view_win.cc @@ -6,6 +6,7 @@ #include <windows.h> +#include "app/gfx/chrome_canvas.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/browser_process.h" @@ -21,7 +22,6 @@ #include "chrome/browser/tab_contents/web_drag_source.h" #include "chrome/browser/tab_contents/web_drop_target.h" #include "chrome/browser/views/sad_tab_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/url_constants.h" #include "chrome/views/focus/view_storage.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 38c658b..0e9b385 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -6,6 +6,7 @@ #include <commdlg.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" @@ -13,7 +14,6 @@ #include "base/win_util.h" #include "base/word_iterator.h" #include "chrome/browser/browser_list.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/restart_message_box.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 4fed441..70efbc9 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -6,12 +6,12 @@ #include <dwmapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/path.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 9220049..3d8bf6b 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,13 +12,13 @@ #include <math.h> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6cc1554..19dfa90 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -6,6 +6,7 @@ #include <limits> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -25,7 +26,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/event_utils.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 7bb4cce..d731fac 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" @@ -14,7 +15,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 585f6a4..4be9ec3 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "base/thread.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" @@ -21,7 +22,6 @@ #include "chrome/browser/views/bookmark_folder_tree_view.h" #include "chrome/browser/views/bookmark_table_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index cf115a4..61be2b0 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_table_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -11,7 +12,6 @@ #include "chrome/browser/bookmarks/bookmark_table_model.h" #include "chrome/browser/profile.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index fbe8264..ab42c6b 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/constrained_window_impl.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" @@ -17,7 +18,6 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/text_elider.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 5653fda..17a6108 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_path.h" @@ -14,7 +15,6 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 8b52280..9b97983 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" @@ -14,7 +15,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/download_item_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 7c7a26a..1ca1c22 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index ea92f19..880f011 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/browser_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -47,7 +48,6 @@ #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 89438b3..b8758b9 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/frame/glass_browser_frame_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 23ea9ae..24bcc2b 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index e490995..ad534f5 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/fullscreen_exit_bubble.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 9d37319..fb048b3 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/hung_renderer_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -11,7 +12,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 633de1b..8fe97d8 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/info_bubble.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 86ec619..c22fa5c 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/infobars/infobars.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 41d0953..0686de8 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/location_bar_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/path_service.h" @@ -25,7 +26,6 @@ #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/first_run_bubble.h" #include "chrome/browser/views/page_info_window.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/background.h" #include "chrome/views/border.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 52cdd16..c3ef712 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -12,6 +12,7 @@ #include <vsstyle.h> #include <vssym32.h> +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" @@ -29,7 +30,6 @@ #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/filter_policy.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 095ea36..f289f09 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/views/options/content_page_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/passwords_exceptions_window_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f428ff1..b539aec 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,13 +6,13 @@ #include "chrome/browser/views/options/cookies_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/win_util.h" #include "chrome/views/border.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 554acb3..a026b4d 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,6 +11,7 @@ #include <vector> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.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/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index c960f13..8337676 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -8,6 +8,7 @@ #include "chrome/browser/views/options/languages_page_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/views/options/language_combobox_model.h" #include "chrome/browser/views/restart_message_box.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/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index a6071dc..fa4fd97 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,12 +7,12 @@ #include "chrome/browser/views/options/options_group_view.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_font.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/separator.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 1653894..ea52cc0 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/sad_tab_view.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index d350972..01ab0b3 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/star_toggle.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "grit/theme_resources.h" StarToggle::StarToggle(Delegate* delegate) diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index cf8a18a..38eebbd 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,12 +6,12 @@ #include <algorithm> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/animation.h" #include "app/resource_bundle.h" #include "base/string_util.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/views/controls/label.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 43afd4f..0ae41cc 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -7,12 +7,12 @@ #include <windows.h> #include <shellapi.h> +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 370a170..c53622f 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -8,6 +8,7 @@ #include <set> #include "app/animation.h" +#include "app/gfx/chrome_canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/views/event.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 4f233d2..90e6d23 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/tabs/dragged_tab_view.h" -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc index f77f309..ba825b0 100644 --- a/chrome/browser/views/tabs/hwnd_photobooth.cc +++ b/chrome/browser/views/tabs/hwnd_photobooth.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/gfx/point.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/widget/widget_win.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index ee2638f..0ed0368 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/tabs/tab.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 7f1d805..039954f 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,13 +6,13 @@ #include "chrome/browser/views/tabs/tab_renderer.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 0d314ab..ec487aa 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -18,7 +19,6 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/tab_contents/tab_contents.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/common/pref_names.h" diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc index a1b802f..af863f8 100644 --- a/chrome/browser/views/theme_helpers.cc +++ b/chrome/browser/views/theme_helpers.cc @@ -8,7 +8,7 @@ #include <atlapp.h> #include <atltheme.h> -#include "chrome/common/gfx/chrome_canvas.h" +#include "app/gfx/chrome_canvas.h" #include "base/logging.h" #include "skia/ext/bitmap_platform_device_win.h" #include "SkGradientShader.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index d17fa46..333cc6c 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,6 +6,7 @@ #include <string> +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -33,7 +34,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e48e4f6..99099a6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -126,6 +126,10 @@ # All .cc, .h, and .mm files under app/ except for tests. '../app/animation.cc', '../app/animation.h', + '../app/gfx/chrome_canvas.cc', + '../app/gfx/chrome_canvas.h', + '../app/gfx/chrome_canvas_linux.cc', + '../app/gfx/chrome_canvas_win.cc', '../app/l10n_util.cc', '../app/l10n_util.h', '../app/l10n_util_posix.cc', @@ -216,10 +220,6 @@ 'common/extensions/url_pattern.h', 'common/extensions/user_script.cc', 'common/extensions/user_script.h', - 'common/gfx/chrome_canvas.cc', - 'common/gfx/chrome_canvas.h', - 'common/gfx/chrome_canvas_linux.cc', - 'common/gfx/chrome_canvas_win.cc', 'common/gfx/chrome_font.h', 'common/gfx/chrome_font_gtk.cc', 'common/gfx/chrome_font_mac.mm', diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index e8519d6..f8b4613 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -149,18 +149,6 @@ Name="gfx" > <File - RelativePath=".\gfx\chrome_canvas.cc" - > - </File> - <File - RelativePath=".\gfx\chrome_canvas.h" - > - </File> - <File - RelativePath=".\gfx\chrome_canvas_win.cc" - > - </File> - <File RelativePath=".\gfx\chrome_font.h" > </File> diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 0a3a412..f3b7e86 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -4,12 +4,12 @@ #include "chrome/plugin/webplugin_proxy.h" +#include "app/gfx/chrome_canvas.h" #include "base/scoped_handle.h" #include "base/shared_memory.h" #include "base/singleton.h" #include "base/waitable_event.h" #include "build/build_config.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_proxy.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index e911b09..9b2f8a3 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -10,6 +10,7 @@ #include <atlbase.h> #endif +#include "app/gfx/chrome_canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" @@ -18,7 +19,6 @@ #include "base/gfx/size.h" #include "base/gfx/native_widget_types.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" #include "chrome/plugin/npobject_proxy.h" 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" |