diff options
Diffstat (limited to 'chrome/browser/views')
37 files changed, 37 insertions, 37 deletions
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" |