diff options
Diffstat (limited to 'chrome/browser/views')
64 files changed, 72 insertions, 72 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 228e8e5..331ba14 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/about_chrome_view.h" #include "app/bidi_line_iterator.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" @@ -18,6 +17,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/platform_util.h" #include "chrome/common/url_constants.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 5a2bdd8..72f551d 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "app/bidi_line_iterator.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -15,6 +14,7 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/bubble_positioner.h" #include "chrome/browser/views/bubble_border.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "gfx/insets.h" #include "gfx/path.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index 553a75a..58d3c3a 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ #define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_ -#include "app/gfx/font.h" #include "app/slide_animation.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" +#include "gfx/font.h" #include "views/view.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc index 0d9dc0b..1721208 100644 --- a/chrome/browser/views/autofill_profiles_view_win.cc +++ b/chrome/browser/views/autofill_profiles_view_win.cc @@ -6,7 +6,6 @@ #include <vsstyle.h> #include <vssym32.h> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" @@ -18,6 +17,7 @@ #include "chrome/browser/theme_resources_util.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "gfx/size.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6e3718a..03a4a9c 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -9,7 +9,6 @@ #include <set> #include <vector> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -37,6 +36,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 77a6763..ef9d5a4 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/bookmark_bubble_view.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" @@ -17,6 +16,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index fc8ddd1..43e3c75 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" @@ -29,6 +28,7 @@ #include "chrome/browser/views/bookmark_folder_tree_view.h" #include "chrome/browser/views/bookmark_table_view.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "gfx/skia_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index e673772..7a48cef 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -7,7 +7,6 @@ #include <commctrl.h> #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_win.h" @@ -19,6 +18,7 @@ #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "views/controls/table/table_view_observer.h" #include "views/view_constants.h" diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index 9634c93..5fa57ab 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/browser_actions_container.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -28,6 +27,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/views/bubble_border.cc b/chrome/browser/views/bubble_border.cc index 01f9250..230a0f4 100644 --- a/chrome/browser/views/bubble_border.cc +++ b/chrome/browser/views/bubble_border.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/bubble_border.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index 809fbba..488f1a4 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/constrained_window_win.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/text_elider.h" @@ -22,6 +20,8 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "gfx/rect.h" #include "grit/app_resources.h" diff --git a/chrome/browser/views/cookie_info_view.cc b/chrome/browser/views/cookie_info_view.cc index 23922b3..1c2ccf9 100644 --- a/chrome/browser/views/cookie_info_view.cc +++ b/chrome/browser/views/cookie_info_view.cc @@ -6,13 +6,13 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profile.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc index 46642b3..16e2b94 100644 --- a/chrome/browser/views/cookie_prompt_view.cc +++ b/chrome/browser/views/cookie_prompt_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -21,6 +20,7 @@ #include "chrome/browser/views/local_storage_set_item_info_view.h" #include "chrome/browser/views/options/content_settings_window_view.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/create_application_shortcut_view.cc b/chrome/browser/views/create_application_shortcut_view.cc index 80ca463..0d3f6e2 100644 --- a/chrome/browser/views/create_application_shortcut_view.cc +++ b/chrome/browser/views/create_application_shortcut_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/create_application_shortcut_view.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" @@ -14,6 +13,7 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/codec/png_codec.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/detachable_toolbar_view.cc b/chrome/browser/views/detachable_toolbar_view.cc index 5b31f3d..2e3e457 100644 --- a/chrome/browser/views/detachable_toolbar_view.cc +++ b/chrome/browser/views/detachable_toolbar_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/detachable_toolbar_view.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_theme_provider.h" +#include "gfx/canvas.h" #include "gfx/skia_util.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index add4203..3127813 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/text_elider.h" @@ -21,6 +20,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h index 147eda5..4c1526c 100644 --- a/chrome/browser/views/download_item_view.h +++ b/chrome/browser/views/download_item_view.h @@ -18,7 +18,6 @@ #include <string> -#include "app/gfx/font.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" @@ -27,6 +26,7 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" +#include "gfx/font.h" #include "views/event.h" #include "views/controls/button/button.h" #include "views/view.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 6455f3c..ff6346d 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" @@ -18,6 +17,7 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/views/download_item_view.h" #include "chrome/browser/views/frame/browser_view.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/background.h" diff --git a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc index 6d6a740..2c379c1 100644 --- a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc +++ b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/extensions/browser_action_overflow_menu_controller.h" -#include "app/gfx/canvas.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_context_menu_model.h" @@ -13,6 +12,7 @@ #include "chrome/browser/views/browser_actions_container.h" #include "chrome/browser/views/extensions/browser_action_drag_data.h" #include "chrome/common/extensions/extension.h" +#include "gfx/canvas.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/views/extensions/extension_shelf.h b/chrome/browser/views/extensions/extension_shelf.h index 2a0ef6b..af6abe2 100644 --- a/chrome/browser/views/extensions/extension_shelf.h +++ b/chrome/browser/views/extensions/extension_shelf.h @@ -5,13 +5,13 @@ #ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_SHELF_H_ #define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_SHELF_H_ -#include "app/gfx/canvas.h" #include "app/slide_animation.h" #include "base/task.h" #include "chrome/browser/extensions/extension_shelf_model.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/views/browser_bubble.h" #include "chrome/browser/views/detachable_toolbar_view.h" +#include "gfx/canvas.h" #include "views/view.h" class Browser; diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index a8cb944..6803cae 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -15,6 +14,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/find_bar_host.h" #include "chrome/browser/view_ids.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/views/frame/app_panel_browser_frame_view.cc index c3c5c98..1437c50 100644 --- a/chrome/browser/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/views/frame/app_panel_browser_frame_view.cc @@ -4,14 +4,14 @@ #include "chrome/browser/views/frame/app_panel_browser_frame_view.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc index 9e1699c..ef6f5a1 100644 --- a/chrome/browser/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/views/frame/browser_frame_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/frame/browser_frame_gtk.h" -#include "app/gfx/font.h" #include "base/logging.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" @@ -14,6 +13,7 @@ #include "chrome/browser/views/frame/browser_root_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "gfx/font.h" #include "views/widget/root_view.h" #include "views/window/hit_test.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index d484765..302e13f 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -9,7 +9,6 @@ #endif #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -62,6 +61,7 @@ #include "chrome/common/native_window_notification_source.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/scrollbar_size.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 04c2bd6..b1f36af 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/frame/glass_browser_frame_view.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "chrome/app/chrome_dll_resource.h" @@ -12,6 +11,7 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/side_tab_strip.h" #include "chrome/browser/views/tabs/tab_strip.h" +#include "gfx/canvas.h" #include "gfx/icon_util.h" #include "grit/app_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 99fe001..6c792c9 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -16,6 +14,8 @@ #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 "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index 3d4f06d..c12326a 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/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" #include "chrome/app/chrome_dll_resource.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "views/screen.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 10f4a25..c9db9cf 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/hung_renderer_dialog.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/i18n/rtl.h" @@ -15,6 +14,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" +#include "gfx/canvas.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index e1bb401..e5c4858 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/canvas.h" #include "base/keyboard_codes.h" #include "chrome/browser/views/bubble_border.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "gfx/path.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/chrome/browser/views/infobars/extension_infobar.cc b/chrome/browser/views/infobars/extension_infobar.cc index d430320..ac9e689 100644 --- a/chrome/browser/views/infobars/extension_infobar.cc +++ b/chrome/browser/views/infobars/extension_infobar.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/infobars/extension_infobar.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "chrome/browser/extensions/extension_context_menu_model.h" @@ -13,6 +12,7 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/platform_util.h" +#include "gfx/canvas.h" #include "grit/browser_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/menu_button.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 49cc4bb..37b4620 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/infobars/infobars.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -14,6 +13,7 @@ #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/background.h" diff --git a/chrome/browser/views/infobars/translate_infobars.cc b/chrome/browser/views/infobars/translate_infobars.cc index 88c8a3e..60e0f62 100644 --- a/chrome/browser/views/infobars/translate_infobars.cc +++ b/chrome/browser/views/infobars/translate_infobars.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" @@ -16,6 +15,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/translate/languages_menu_model.h" #include "chrome/browser/translate/options_menu_model.h" +#include "gfx/canvas.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 368a870..fec0d7f 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -8,7 +8,6 @@ #include <gtk/gtk.h> #endif -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -33,6 +32,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index 1cac844..b856845 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -9,7 +9,6 @@ #include <map> #include <vector> -#include "app/gfx/font.h" #include "base/task.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/extensions/extension_context_menu_model.h" @@ -23,6 +22,7 @@ #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc index b9a765b..d0e27fa 100644 --- a/chrome/browser/views/notifications/balloon_view.cc +++ b/chrome/browser/views/notifications/balloon_view.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" @@ -22,6 +21,7 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/canvas.h" #include "gfx/insets.h" #include "gfx/native_widget_types.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index e7dcfa8..977c425 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -13,7 +13,6 @@ #include <vssym32.h> #include "app/combobox_model.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -40,6 +39,7 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc index b74267f..60db036 100644 --- a/chrome/browser/views/options/content_filter_page_view.cc +++ b/chrome/browser/views/options/content_filter_page_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/options/content_filter_page_view.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/exceptions_view.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 8a626ef..addd3af 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,7 +9,6 @@ #include <vsstyle.h> #include <vssym32.h> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autofill/autofill_dialog.h" @@ -25,6 +24,7 @@ #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/passwords_exceptions_window_view.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/cookie_filter_page_view.cc b/chrome/browser/views/options/cookie_filter_page_view.cc index ac8ac6d..9bdef63 100644 --- a/chrome/browser/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/views/options/cookie_filter_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/options/cookie_filter_page_view.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" @@ -15,6 +14,7 @@ #include "chrome/browser/views/options/cookies_view.h" #include "chrome/browser/views/options/exceptions_view.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index eddd30c..90abe20 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -16,6 +15,7 @@ #include "chrome/browser/views/cookie_info_view.h" #include "chrome/browser/views/database_info_view.h" #include "chrome/browser/views/local_storage_info_view.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 5b92361..d832362 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -12,8 +12,6 @@ #include <vector> #include "app/combobox_model.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_collator.h" #include "app/resource_bundle.h" @@ -25,6 +23,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 260baa3..cb76b39 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -9,8 +9,6 @@ #include "chrome/browser/views/options/languages_page_view.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -26,6 +24,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_common.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/native_theme_win.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index bbd24b0..3426d22 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,10 +7,10 @@ #include "chrome/browser/views/options/options_group_view.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/native_theme_win.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 4af6681..0e626d6 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/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "gfx/canvas.h" #include "gfx/size.h" #include "gfx/skia_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h index 5b28705..fff7213 100644 --- a/chrome/browser/views/sad_tab_view.h +++ b/chrome/browser/views/sad_tab_view.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_ #define CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_ -#include "app/gfx/font.h" #include "base/basictypes.h" +#include "gfx/font.h" #include "views/controls/link.h" #include "views/view.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index b745a8d..7d4f8ef 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -11,7 +11,6 @@ #include <algorithm> #include <set> -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/win_util.h" #include "base/file_util.h" @@ -21,6 +20,7 @@ #include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/browser/chrome_thread.h" +#include "gfx/font.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" #include "net/base/mime_util.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index b533729..823b900 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/animation.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/text_elider.h" @@ -15,6 +14,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_theme_provider.h" +#include "gfx/canvas.h" #include "gfx/point.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc index e1d4d02..880413b 100644 --- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc @@ -7,7 +7,6 @@ #include <gdk/gdk.h> #include <gtk/gtk.h> -#include "app/gfx/canvas_paint.h" #include "base/string_util.h" #include "build/build_config.h" #include "chrome/browser/download/download_shelf.h" @@ -22,6 +21,7 @@ #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" #include "chrome/browser/views/sad_tab_view.h" #include "chrome/browser/views/tab_contents/render_view_context_menu_gtk.h" +#include "gfx/canvas_paint.h" #include "gfx/point.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc index 5297b5d..6925765 100644 --- a/chrome/browser/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_view_win.cc @@ -6,7 +6,6 @@ #include <windows.h> -#include "app/gfx/canvas_paint.h" #include "app/os_exchange_data.h" #include "base/file_path.h" #include "base/keyboard_codes.h" @@ -26,6 +25,7 @@ #include "chrome/browser/views/sad_tab_view.h" #include "chrome/browser/views/tab_contents/render_view_context_menu_win.h" #include "chrome/browser/views/tab_contents/tab_contents_drag_win.h" +#include "gfx/canvas_paint.h" #include "views/focus/view_storage.h" #include "views/screen.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 1fa805b..7c02b14a 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -9,7 +9,6 @@ #include <shellapi.h> #endif -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" @@ -17,6 +16,7 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" +#include "gfx/canvas.h" #include "gfx/favicon_size.h" #include "grit/app_resources.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 b953466..dde0267 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -9,7 +9,6 @@ #include "app/animation.h" #include "app/slide_animation.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" @@ -26,6 +25,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/event.h" diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 386cfef..6b9306e 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/tabs/dragged_tab_view.h" -#include "app/gfx/canvas.h" #include "base/callback.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/native_view_photobooth.h" #include "chrome/browser/views/tabs/tab_renderer.h" +#include "gfx/canvas.h" #include "third_party/skia/include/core/SkShader.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/chrome/browser/views/tabs/native_view_photobooth_gtk.cc b/chrome/browser/views/tabs/native_view_photobooth_gtk.cc index 83077aa..a307112 100644 --- a/chrome/browser/views/tabs/native_view_photobooth_gtk.cc +++ b/chrome/browser/views/tabs/native_view_photobooth_gtk.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/tabs/native_view_photobooth_gtk.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" /////////////////////////////////////////////////////////////////////////////// // NativeViewPhotoboothGtk, public: diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.cc b/chrome/browser/views/tabs/native_view_photobooth_win.cc index da75fcc..8920a9b 100644 --- a/chrome/browser/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/views/tabs/native_view_photobooth_win.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/tabs/native_view_photobooth_win.h" -#include "app/gfx/canvas.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "gfx/canvas.h" #include "gfx/point.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc index c08eaaa..c11fead 100644 --- a/chrome/browser/views/tabs/side_tab.cc +++ b/chrome/browser/views/tabs/side_tab.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/tabs/side_tab.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "gfx/skia_util.h" #include "grit/app_resources.h" diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h index 72fc8b0..b267d5a 100644 --- a/chrome/browser/views/tabs/side_tab.h +++ b/chrome/browser/views/tabs/side_tab.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_ #define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_ -#include "app/gfx/font.h" #include "app/slide_animation.h" #include "chrome/browser/views/tabs/side_tab_strip_model.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "gfx/font.h" #include "views/controls/button/button.h" #include "views/view.h" diff --git a/chrome/browser/views/tabs/side_tab_strip.cc b/chrome/browser/views/tabs/side_tab_strip.cc index 6896d42..7ef38d6 100644 --- a/chrome/browser/views/tabs/side_tab_strip.cc +++ b/chrome/browser/views/tabs/side_tab_strip.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/tabs/side_tab_strip.h" -#include "app/gfx/canvas.h" #include "base/command_line.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" namespace { const int kVerticalTabSpacing = 2; diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 4c6aa46..ee08bdd 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/tabs/tab.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" @@ -13,6 +11,8 @@ #include "chrome/browser/tab_menu_model.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "gfx/size.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index db07e33..8b27fcb 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,8 +6,6 @@ #include <limits> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -18,7 +16,9 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "gfx/canvas.h" #include "gfx/favicon_size.h" +#include "gfx/font.h" #include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index ccfc31a..6edd1e4 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -26,6 +25,7 @@ #include "chrome/browser/views/tabs/tab.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "gfx/size.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/theme_background.cc b/chrome/browser/views/theme_background.cc index 8234e3a..06f0f6f 100644 --- a/chrome/browser/views/theme_background.cc +++ b/chrome/browser/views/theme_background.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/theme_background.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/frame/browser_view.h" +#include "gfx/canvas.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc index 1d63ea6..82de958 100644 --- a/chrome/browser/views/theme_helpers.cc +++ b/chrome/browser/views/theme_helpers.cc @@ -8,8 +8,8 @@ #include <atlapp.h> #include <atltheme.h> -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "skia/ext/bitmap_platform_device_win.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/chrome/browser/views/theme_install_bubble_view.h b/chrome/browser/views/theme_install_bubble_view.h index ff08621..baf80b3 100644 --- a/chrome/browser/views/theme_install_bubble_view.h +++ b/chrome/browser/views/theme_install_bubble_view.h @@ -7,9 +7,9 @@ #include <string> -#include "app/gfx/canvas.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas.h" #include "views/controls/label.h" class TabContents; diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 9670c24..a771c98 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -8,7 +8,6 @@ #include <string> #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -43,6 +42,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" |