diff options
199 files changed, 251 insertions, 246 deletions
diff --git a/app/app.gyp b/app/app.gyp index efd11c9..d8fef69 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -39,7 +39,6 @@ 'sources': [ 'animation_unittest.cc', 'clipboard/clipboard_unittest.cc', - 'gfx/font_unittest.cc', 'l10n_util_mac_unittest.mm', 'l10n_util_unittest.cc', 'os_exchange_data_win_unittest.cc', diff --git a/app/app_base.gypi b/app/app_base.gypi index 578701f..5358a0b 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -112,18 +112,8 @@ 'drag_drop_types_win.cc', 'drag_drop_types.h', 'file_download_interface.h', - 'gfx/canvas.cc', - 'gfx/canvas.h', - 'gfx/canvas_linux.cc', - 'gfx/canvas_mac.mm', - 'gfx/canvas_win.cc', - 'gfx/font.h', - 'gfx/font_gtk.cc', - 'gfx/font_mac.mm', - 'gfx/font_skia.cc', 'gfx/font_util.h', 'gfx/font_util.cc', - 'gfx/font_win.cc', 'gtk_dnd_util.cc', 'gtk_dnd_util.h', 'gtk_signal.h', diff --git a/app/gfx/font_util.cc b/app/gfx/font_util.cc index ec94489..b079dd9 100644 --- a/app/gfx/font_util.cc +++ b/app/gfx/font_util.cc @@ -4,11 +4,11 @@ #include "app/gfx/font_util.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "gfx/font.h" namespace gfx { diff --git a/app/l10n_util.cc b/app/l10n_util.cc index d51dc89..b22e26f 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -8,7 +8,6 @@ #include "app/app_paths.h" #include "app/app_switches.h" -#include "app/gfx/canvas.h" #include "app/l10n_util_collator.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -22,6 +21,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "build/build_config.h" +#include "gfx/canvas.h" #include "unicode/rbbi.h" #if defined(OS_MACOSX) diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index a5f42db..37fc6e0 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -4,10 +4,10 @@ #include "app/resource_bundle.h" -#include "app/gfx/font.h" #include "base/logging.h" #include "base/string_piece.h" #include "gfx/codec/png_codec.h" +#include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc index 034e435..6baa1a8 100644 --- a/app/resource_bundle_dummy.cc +++ b/app/resource_bundle_dummy.cc @@ -6,9 +6,9 @@ #include <windows.h> -#include "app/gfx/font.h" #include "base/logging.h" #include "base/win_util.h" +#include "gfx/font.h" ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index cc9dbad..9f0fd56 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/app_paths.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/base_paths.h" #include "base/data_pack.h" @@ -18,6 +17,7 @@ #include "base/path_service.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "gfx/font.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/app/resource_bundle_posix.cc b/app/resource_bundle_posix.cc index 462240f..5b1fb3c 100644 --- a/app/resource_bundle_posix.cc +++ b/app/resource_bundle_posix.cc @@ -4,12 +4,12 @@ #include "app/resource_bundle.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/data_pack.h" #include "base/logging.h" #include "base/string16.h" #include "base/string_piece.h" +#include "gfx/font.h" namespace { diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index ae420b8..72cfb38 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -7,7 +7,6 @@ #include <atlbase.h> #include "app/app_paths.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/debug_util.h" #include "base/file_util.h" @@ -16,6 +15,7 @@ #include "base/resource_util.h" #include "base/string_piece.h" #include "base/win_util.h" +#include "gfx/font.h" namespace { diff --git a/app/text_elider.cc b/app/text_elider.cc index 98b9090..1098f82 100644 --- a/app/text_elider.cc +++ b/app/text_elider.cc @@ -4,7 +4,6 @@ #include <vector> -#include "app/gfx/font.h" #include "app/text_elider.h" #include "app/l10n_util.h" #include "base/file_path.h" @@ -12,6 +11,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" +#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/net_util.h" diff --git a/app/text_elider.h b/app/text_elider.h index f93b944..f3d0246 100644 --- a/app/text_elider.h +++ b/app/text_elider.h @@ -8,9 +8,9 @@ #include <unicode/coll.h> #include <unicode/uchar.h> -#include "app/gfx/font.h" #include "base/basictypes.h" #include "base/string16.h" +#include "gfx/font.h" class FilePath; class GURL; diff --git a/app/text_elider_unittest.cc b/app/text_elider_unittest.cc index f2a81f4f..d976333 100644 --- a/app/text_elider_unittest.cc +++ b/app/text_elider_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/font.h" #include "app/text_elider.h" #include "app/l10n_util.h" #include "base/file_path.h" #include "base/i18n/rtl.h" #include "base/string_util.h" +#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/app/win_util.h b/app/win_util.h index cac4b39..6e2812e 100644 --- a/app/win_util.h +++ b/app/win_util.h @@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "app/gfx/font.h" #include "base/fix_wp64.h" #include "base/scoped_handle.h" +#include "gfx/font.h" #include "gfx/rect.h" class FilePath; diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 1c72a2c..61741e9f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -11,7 +11,6 @@ #include "app/clipboard/clipboard.h" #include "app/clipboard/scoped_clipboard_writer.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/toolbar_model.h" #include "chrome/common/notification_service.h" +#include "gfx/font.h" #include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index fa547d3..aa9fd4c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -10,7 +10,6 @@ #include "app/clipboard/clipboard.h" #include "app/clipboard/scoped_clipboard_writer.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/os_exchange_data.h" @@ -43,6 +42,7 @@ #include "chrome/common/gfx/utils.h" #include "chrome/common/notification_service.h" #include "googleurl/src/url_util.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index c24996e..9de2d34 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -12,7 +12,6 @@ #include <atlmisc.h> #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl. -#include "app/gfx/font.h" #include "app/menus/simple_menu_model.h" #include "base/scoped_comptr_win.h" #include "base/scoped_ptr.h" @@ -21,6 +20,7 @@ #include "chrome/browser/toolbar_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/common/page_transition_types.h" +#include "gfx/font.h" #include "webkit/glue/window_open_disposition.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index b94c3b0..84538e0f 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -9,7 +9,6 @@ #include <algorithm> #include <string> -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" @@ -26,6 +25,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/notification_service.h" +#include "gfx/font.h" #include "gfx/gtk_util.h" #include "gfx/rect.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h index 809562d..a430f58 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h @@ -9,12 +9,12 @@ #include <string> -#include "app/gfx/font.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/scoped_nsobject.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" +#include "gfx/font.h" #include "webkit/glue/window_open_disposition.h" class AutocompletePopupModel; diff --git a/chrome/browser/chromeos/compact_location_bar_view.cc b/chrome/browser/chromeos/compact_location_bar_view.cc index 9fddf15..576f114 100644 --- a/chrome/browser/chromeos/compact_location_bar_view.cc +++ b/chrome/browser/chromeos/compact_location_bar_view.cc @@ -9,7 +9,6 @@ #include "app/l10n_util.h" #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" @@ -26,6 +25,7 @@ #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/toolbar_star_toggle.h" +#include "gfx/canvas.h" #include "gfx/point.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/compact_navigation_bar.cc b/chrome/browser/chromeos/compact_navigation_bar.cc index 5cc51c0..ef0a394 100644 --- a/chrome/browser/chromeos/compact_navigation_bar.cc +++ b/chrome/browser/chromeos/compact_navigation_bar.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/compact_navigation_bar.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -20,6 +19,7 @@ #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/theme_background.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/button_dropdown.h" diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index a8040ad0..0520eb6 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <string> -#include "app/gfx/canvas.h" #include "app/menus/simple_menu_model.h" #include "app/theme_provider.h" #include "chrome/app/chrome_dll_resource.h" @@ -28,6 +27,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/toolbar_view.h" #include "chrome/browser/views/toolbar_star_toggle.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc index 5315f80..c84e2bd 100644 --- a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc +++ b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc @@ -4,8 +4,6 @@ #include "chrome/browser/chromeos/frame/normal_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" @@ -19,6 +17,8 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/chrome_switches.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/chromeos/login/account_creation_view.cc b/chrome/browser/chromeos/login/account_creation_view.cc index d808f53..1de0634 100644 --- a/chrome/browser/chromeos/login/account_creation_view.cc +++ b/chrome/browser/chromeos/login/account_creation_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/account_creation_view.h" -#include "app/gfx/canvas.h" #include "base/callback.h" #include "base/string_util.h" #include "base/values.h" @@ -13,6 +12,7 @@ #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/bindings_policy.h" +#include "gfx/canvas.h" #include "ipc/ipc_message.h" #include "views/border.h" #include "webkit/glue/form_field_values.h" diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index fb89324..194d2c1 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/login/rounded_rect_painter.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" #include "views/border.h" diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.h b/chrome/browser/chromeos/login/rounded_rect_painter.h index 3299c36..ccc9fd9 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.h +++ b/chrome/browser/chromeos/login/rounded_rect_painter.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ROUNDED_RECT_PAINTER_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_ROUNDED_RECT_PAINTER_H_ -#include "app/gfx/canvas.h" +#include "third_party/skia/include/core/SkColor.h" namespace views { class Border; diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index b6918e5..3fcf1644 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/login/user_controller.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/chromeos/login/wizard_screen.h b/chrome/browser/chromeos/login/wizard_screen.h index c2804af..9cac5ad 100644 --- a/chrome/browser/chromeos/login/wizard_screen.h +++ b/chrome/browser/chromeos/login/wizard_screen.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_SCREEN_H_ #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_SCREEN_H_ -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" class WizardScreen; namespace chromeos { diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 3d18a7a..c82dd39 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -6,10 +6,10 @@ #include "chrome/browser/chromeos/notifications/notification_panel.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/chromeos/notifications/balloon_view.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "views/background.h" #include "views/controls/scroll_view.h" diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index 8982f16..cd0e280 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -8,13 +8,13 @@ #include <utility> #include <vector> -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/language_library.h" #include "chrome/browser/chromeos/options/language_hangul_config_view.h" #include "chrome/browser/language_combobox_model.h" +#include "gfx/font.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc index c2af341..ec681f3 100644 --- a/chrome/browser/chromeos/panels/panel_scroller.cc +++ b/chrome/browser/chromeos/panels/panel_scroller.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/panels/panel_scroller.h" -#include "app/gfx/canvas.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "gfx/canvas.h" #include "chrome/browser/chromeos/panels/panel_scroller_container.h" #include "chrome/browser/chromeos/panels/panel_scroller_header.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/panels/panel_scroller_container.cc b/chrome/browser/chromeos/panels/panel_scroller_container.cc index ace44d5..e070852 100644 --- a/chrome/browser/chromeos/panels/panel_scroller_container.cc +++ b/chrome/browser/chromeos/panels/panel_scroller_container.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/panels/panel_scroller_container.h" -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" PanelScrollerContainer::PanelScrollerContainer(PanelScroller* scroller, views::View* contents) diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.cc b/chrome/browser/chromeos/panels/panel_scroller_header.cc index ebd8131..f6dceea 100644 --- a/chrome/browser/chromeos/panels/panel_scroller_header.cc +++ b/chrome/browser/chromeos/panels/panel_scroller_header.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/panels/panel_scroller_header.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/panels/panel_scroller.h" +#include "gfx/canvas.h" +#include "gfx/font.h" PanelScrollerHeader::PanelScrollerHeader(PanelScroller* scroller) : views::View(), diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 68c5a6c..d36d233 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -4,8 +4,6 @@ #include "chrome/browser/chromeos/status/clock_menu_button.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/i18n/time_formatting.h" @@ -15,6 +13,8 @@ #include "chrome/browser/chromeos/status/status_area_host.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "grit/generated_resources.h" #include "unicode/calendar.h" diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 5beb856..3d487fb 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -6,13 +6,13 @@ #include <limits> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/status/status_area_host.h" +#include "gfx/canvas.h" #include "gfx/skbitmap_operations.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 48615c1..2a4c221 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/status/power_menu_button.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/time.h" #include "chrome/browser/chromeos/cros/cros_library.h" +#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index cf52779..5c4e685 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/status/status_area_button.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" +#include "gfx/canvas.h" #include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" #include "views/border.h" diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc index 75a5270..fb9a5a3 100644 --- a/chrome/browser/chromeos/status/status_area_view.cc +++ b/chrome/browser/chromeos/status/status_area_view.cc @@ -6,12 +6,12 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "chrome/browser/chromeos/status/clock_menu_button.h" #include "chrome/browser/chromeos/status/language_menu_button.h" #include "chrome/browser/chromeos/status/network_menu_button.h" #include "chrome/browser/chromeos/status/power_menu_button.h" #include "chrome/browser/chromeos/status/status_area_host.h" +#include "gfx/canvas.h" namespace chromeos { diff --git a/chrome/browser/chromeos/text_input/candidate_window.cc b/chrome/browser/chromeos/text_input/candidate_window.cc index fefacfa..f075207 100644 --- a/chrome/browser/chromeos/text_input/candidate_window.cc +++ b/chrome/browser/chromeos/text_input/candidate_window.cc @@ -11,8 +11,6 @@ #include <vector> #include "app/app_paths.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/file_path.h" @@ -23,6 +21,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/common/chrome_paths.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "third_party/cros/chromeos_cros_api.h" #include "third_party/cros/chromeos_ime.h" #include "views/controls/label.h" diff --git a/chrome/browser/cocoa/autocomplete_text_field_cell.mm b/chrome/browser/cocoa/autocomplete_text_field_cell.mm index 4b719a1..751d62c 100644 --- a/chrome/browser/cocoa/autocomplete_text_field_cell.mm +++ b/chrome/browser/cocoa/autocomplete_text_field_cell.mm @@ -4,9 +4,9 @@ #import "chrome/browser/cocoa/autocomplete_text_field_cell.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "gfx/font.h" namespace { diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm index 5c1c7ad..964a76e 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm @@ -4,7 +4,6 @@ #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" -#include "app/gfx/canvas_paint.h" #include "app/theme_provider.h" #include "gfx/rect.h" #include "chrome/browser/browser_theme_provider.h" @@ -13,6 +12,7 @@ #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/themed_window.h" #include "chrome/browser/ntp_background_util.h" +#include "gfx/canvas_paint.h" const CGFloat kBorderRadius = 3.0; diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download_item_cell.mm index c48606a..dd661c7 100644 --- a/chrome/browser/cocoa/download_item_cell.mm +++ b/chrome/browser/cocoa/download_item_cell.mm @@ -4,7 +4,6 @@ #import "chrome/browser/cocoa/download_item_cell.h" -#include "app/gfx/canvas_paint.h" #include "app/l10n_util.h" #include "app/text_elider.h" #include "base/mac_util.h" @@ -15,6 +14,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" +#include "gfx/canvas_paint.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm index faa01e9..0a2579b 100644 --- a/chrome/browser/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/cocoa/extensions/browser_action_button.mm @@ -4,7 +4,6 @@ #import "chrome/browser/cocoa/extensions/browser_action_button.h" -#include "app/gfx/canvas_paint.h" #include "base/sys_string_conversions.h" #include "chrome/browser/cocoa/extensions/extension_action_context_menu.h" #include "chrome/browser/extensions/image_loading_tracker.h" @@ -13,6 +12,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/canvas_paint.h" #include "gfx/rect.h" #include "gfx/size.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/cocoa/styled_text_field_cell.mm b/chrome/browser/cocoa/styled_text_field_cell.mm index b85d2ed..de81200 100644 --- a/chrome/browser/cocoa/styled_text_field_cell.mm +++ b/chrome/browser/cocoa/styled_text_field_cell.mm @@ -4,11 +4,11 @@ #import "chrome/browser/cocoa/styled_text_field_cell.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#include "gfx/font.h" #include "grit/theme_resources.h" @implementation StyledTextFieldCell diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index b8619e4..5d0c49c 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -11,7 +11,6 @@ #endif #include <string> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -28,6 +27,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/time_format.h" +#include "gfx/canvas.h" #include "gfx/rect.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index c42b5a7..fd4a48b 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/gfx/canvas_paint.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -42,6 +41,7 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas_paint.h" #include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index 7ccaca7a..c652d0b 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/gfx/canvas_paint.h" #include "chrome/browser/browser.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_context_menu_model.h" @@ -28,6 +27,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/canvas_paint.h" #include "gfx/gtk_util.h" #include "grit/app_resources.h" diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index d455198..b6b84f9 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -6,8 +6,6 @@ #include "app/gtk_util.h" #include "app/l10n_util.h" -#include "app/gfx/canvas_paint.h" -#include "app/gfx/font.h" #include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -30,7 +28,9 @@ #include "chrome/browser/gtk/nine_box.h" #include "chrome/browser/gtk/standard_menus.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas_paint.h" #include "gfx/color_utils.h" +#include "gfx/font.h" #include "gfx/skia_utils_gtk.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index c7c6594..5bc1d5e 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/gfx/canvas_paint.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -43,6 +42,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" +#include "gfx/canvas_paint.h" #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index 1e8001f..a3a53dd 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -36,6 +35,7 @@ #include "chrome/common/notification_service.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/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc index 9a8eafb..42bcfb0 100644 --- a/chrome/browser/gtk/options/fonts_page_gtk.cc +++ b/chrome/browser/gtk/options/fonts_page_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/options/fonts_page_gtk.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_collator.h" #include "chrome/browser/browser_process.h" @@ -12,6 +11,7 @@ #include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" +#include "gfx/font.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc index 2093fda..bffadd5 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc @@ -8,7 +8,6 @@ #include <algorithm> -#include "app/gfx/canvas_paint.h" #include "app/x11_util.h" #include "base/i18n/rtl.h" #include "chrome/browser/browser_theme_provider.h" @@ -19,6 +18,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "gfx/canvas_paint.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h index 2da74ea..2eafca2 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h @@ -7,11 +7,11 @@ #include <gtk/gtk.h> -#include "app/gfx/canvas.h" #include "app/slide_animation.h" #include "base/callback.h" #include "base/scoped_ptr.h" #include "base/task.h" +#include "gfx/canvas.h" #include "gfx/point.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 87b48e1..16a823d 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <utility> -#include "app/gfx/canvas_paint.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/throb_animation.h" @@ -20,6 +19,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" +#include "gfx/canvas_paint.h" #include "gfx/favicon_size.h" #include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h index 528a091..912b329 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h @@ -9,14 +9,14 @@ #include <map> #include "app/animation.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/slide_animation.h" #include "base/basictypes.h" #include "base/string16.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index e7e2ac6..1894d16 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/gfx/canvas_paint.h" #include "app/gtk_dnd_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -23,6 +22,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "gfx/canvas_paint.h" #include "gfx/gtk_util.h" #include "gfx/point.h" #include "grit/app_resources.h" diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc index 40a331d..b36ce9f 100644 --- a/chrome/browser/ntp_background_util.cc +++ b/chrome/browser/ntp_background_util.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ntp_background_util.h" -#include "app/gfx/canvas.h" #include "base/logging.h" #include "chrome/browser/browser_theme_provider.h" +#include "gfx/canvas.h" #include "gfx/rect.h" #include "gfx/skia_util.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 6d51f65..e0ffe1a 100644 --- a/chrome/browser/renderer_host/render_widget_host_unittest.cc +++ b/chrome/browser/renderer_host/render_widget_host_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/canvas.h" #include "base/basictypes.h" #include "base/keyboard_codes.h" #include "base/scoped_ptr.h" @@ -12,6 +11,7 @@ #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/common/render_messages.h" +#include "gfx/canvas.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; 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 84e190f..55e2762 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -29,6 +28,7 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" +#include "gfx/canvas.h" #include "gfx/gdi_util.h" #include "gfx/rect.h" #include "grit/webkit_resources.h" diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 0518367..5da098f 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -4,7 +4,6 @@ #include "chrome/browser/sync/sync_setup_flow.h" -#include "app/gfx/font.h" #include "app/gfx/font_util.h" #include "base/callback.h" #include "base/histogram.h" @@ -25,6 +24,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" +#include "gfx/font.h" #include "grit/locale_settings.h" // XPath expression for finding specific iframes. 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" diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index b40d6fb..d86b1f9 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index c036da5..273cd95 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -6,7 +6,6 @@ #include "build/build_config.h" -#include "app/gfx/canvas.h" #if defined(OS_WIN) #include "app/win_util.h" #endif @@ -25,6 +24,7 @@ #include "chrome/plugin/plugin_channel.h" #include "chrome/plugin/plugin_thread.h" #include "gfx/blit.h" +#include "gfx/canvas.h" #if defined(OS_WIN) #include "gfx/gdi_util.h" #endif diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index daf58b5..28a611e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -10,7 +10,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -28,6 +27,7 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "gfx/blit.h" +#include "gfx/canvas.h" #include "gfx/native_widget_types.h" #include "gfx/size.h" #include "grit/generated_resources.h" diff --git a/app/gfx/canvas.cc b/gfx/canvas.cc index 11cf3d5..0099e4c 100644 --- a/app/gfx/canvas.cc +++ b/gfx/canvas.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include <limits> -#include "app/gfx/font.h" #include "base/i18n/rtl.h" #include "base/logging.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/app/gfx/canvas.h b/gfx/canvas.h index ea4fbf3..ffc30fb 100644 --- a/app/gfx/canvas.h +++ b/gfx/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 APP_GFX_CANVAS_H_ -#define APP_GFX_CANVAS_H_ +#ifndef GFX_CANVAS_H_ +#define GFX_CANVAS_H_ #if defined(OS_WIN) #include <windows.h> @@ -235,4 +235,4 @@ class Canvas : public skia::PlatformCanvas { } // namespace gfx; -#endif // APP_GFX_CANVAS_H_ +#endif // GFX_CANVAS_H_ diff --git a/app/gfx/canvas_linux.cc b/gfx/canvas_linux.cc index fdd1242..0981d56 100644 --- a/app/gfx/canvas_linux.cc +++ b/gfx/canvas_linux.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include <cairo/cairo.h> #include <gtk/gtk.h> #include <pango/pango.h> #include <pango/pangocairo.h> -#include "app/gfx/font.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "gfx/font.h" #include "gfx/rect.h" namespace { diff --git a/app/gfx/canvas_mac.mm b/gfx/canvas_mac.mm index 37d97db..ebba090 100644 --- a/app/gfx/canvas_mac.mm +++ b/gfx/canvas_mac.mm @@ -4,11 +4,11 @@ #import <Cocoa/Cocoa.h> -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" -#include "app/gfx/font.h" #include "base/scoped_cftyperef.h" #include "base/sys_string_conversions.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/app/gfx/canvas_paint.h b/gfx/canvas_paint.h index aa253b9..a11a693 100644 --- a/app/gfx/canvas_paint.h +++ b/gfx/canvas_paint.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_GFX_CANVAS_PAINT_H_ -#define APP_GFX_CANVAS_PAINT_H_ +#ifndef GFX_CANVAS_PAINT_H_ +#define GFX_CANVAS_PAINT_H_ -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "skia/ext/canvas_paint.h" // Define a skia::CanvasPaint type that wraps our gfx::Canvas like the @@ -17,4 +17,4 @@ typedef skia::CanvasPaintT<Canvas> CanvasPaint; } // namespace gfx -#endif // APP_GFX_CANVAS_PAINT_H_ +#endif // GFX_CANVAS_PAINT_H_ diff --git a/app/gfx/canvas_win.cc b/gfx/canvas_win.cc index abe722c..be9756a 100644 --- a/app/gfx/canvas_win.cc +++ b/gfx/canvas_win.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include <limits> -#include "app/gfx/font.h" #include "base/i18n/rtl.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/app/gfx/font.h b/gfx/font.h index 66f5a1d..7395a4d 100644 --- a/app/gfx/font.h +++ b/gfx/font.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 APP_GFX_FONT_H_ -#define APP_GFX_FONT_H_ +#ifndef GFX_FONT_H_ +#define GFX_FONT_H_ #include "build/build_config.h" @@ -284,4 +284,4 @@ class Font { } // namespace gfx -#endif // APP_GFX_FONT_H_ +#endif // GFX_FONT_H_ diff --git a/app/gfx/font_gtk.cc b/gfx/font_gtk.cc index dbd4228..7dee3a1 100644 --- a/app/gfx/font_gtk.cc +++ b/gfx/font_gtk.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 "app/gfx/font.h" +#include "gfx/font.h" #include <algorithm> #include <fontconfig/fontconfig.h> diff --git a/app/gfx/font_mac.mm b/gfx/font_mac.mm index 32b8bef..fcc85833 100644 --- a/app/gfx/font_mac.mm +++ b/gfx/font_mac.mm @@ -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 "app/gfx/font.h" +#include "gfx/font.h" #include <Cocoa/Cocoa.h> diff --git a/app/gfx/font_skia.cc b/gfx/font_skia.cc index 3499caa..fffc53e 100644 --- a/app/gfx/font_skia.cc +++ b/gfx/font_skia.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/font.h" +#include "gfx/font.h" #include <gdk/gdk.h> #include <map> #include <pango/pango.h> -#include "app/gfx/canvas.h" #include "base/logging.h" #include "base/string_piece.h" #include "base/sys_string_conversions.h" +#include "gfx/canvas.h" #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/app/gfx/font_unittest.cc b/gfx/font_unittest.cc index 08cc2bc..d2310f8 100644 --- a/app/gfx/font_unittest.cc +++ b/gfx/font_unittest.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 "app/gfx/font.h" +#include "gfx/font.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/app/gfx/font_win.cc b/gfx/font_win.cc index cffd417..b55057c 100644 --- a/app/gfx/font_win.cc +++ b/gfx/font_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 "app/gfx/font.h" +#include "gfx/font.h" #include <windows.h> #include <math.h> diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp index 8a33525..4b7d612 100644 --- a/gfx/gfx.gyp +++ b/gfx/gfx.gyp @@ -20,6 +20,7 @@ 'codec/jpeg_codec_unittest.cc', 'codec/png_codec_unittest.cc', 'color_utils_unittest.cc', + 'font_unittest.cc', 'insets_unittest.cc', 'rect_unittest.cc', 'run_all_unittests.cc', @@ -61,6 +62,11 @@ 'sources': [ 'blit.cc', 'blit.h', + 'canvas.cc', + 'canvas.h', + 'canvas_linux.cc', + 'canvas_mac.mm', + 'canvas_win.cc', 'codec/jpeg_codec.cc', 'codec/jpeg_codec.h', 'codec/png_codec.cc', @@ -68,6 +74,11 @@ 'color_utils.cc', 'color_utils.h', 'favicon_size.h', + 'font.h', + 'font_gtk.cc', + 'font_mac.mm', + 'font_skia.cc', + 'font_win.cc', 'gfx_paths.cc', 'gfx_paths.h', 'insets.cc', @@ -104,6 +115,11 @@ ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'dependencies': [ + # font_gtk.cc uses fontconfig. + # TODO(evanm): I think this is wrong; it should just use GTK. + '../build/linux/system.gyp:fontconfig', + ], 'sources': [ 'gtk_native_view_id_manager.cc', 'gtk_native_view_id_manager.h', diff --git a/printing/printed_document.cc b/printing/printed_document.cc index bdbf4c8..47e4856 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/gfx/font.h" #include "app/text_elider.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" @@ -19,6 +18,7 @@ #include "base/utf_string_conversions.h" #include "base/time.h" #include "base/i18n/time_formatting.h" +#include "gfx/font.h" #include "printing/page_number.h" #include "printing/page_overlays.h" #include "printing/printed_pages_source.h" diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc index 12d5a1a..0c17201 100644 --- a/printing/printed_document_win.cc +++ b/printing/printed_document_win.cc @@ -5,9 +5,9 @@ #include "printing/printed_document.h" #include "app/win_util.h" -#include "app/gfx/font.h" #include "base/logging.h" #include "base/string_util.h" +#include "gfx/font.h" #include "printing/page_number.h" #include "printing/page_overlays.h" #include "printing/printed_pages_source.h" diff --git a/views/background.cc b/views/background.cc index 744aad9..a791f7f 100644 --- a/views/background.cc +++ b/views/background.cc @@ -4,8 +4,8 @@ #include "views/background.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/views/border.cc b/views/border.cc index fa47bbb..1259808 100644 --- a/views/border.cc +++ b/views/border.cc @@ -4,8 +4,8 @@ #include "views/border.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" namespace views { diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc index ac756cd..f1ae320 100644 --- a/views/controls/button/checkbox.cc +++ b/views/controls/button/checkbox.cc @@ -4,8 +4,8 @@ #include "views/controls/button/checkbox.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "views/controls/label.h" namespace views { diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc index e12dab2..245942a 100644 --- a/views/controls/button/image_button.cc +++ b/views/controls/button/image_button.cc @@ -4,8 +4,8 @@ #include "views/controls/button/image_button.h" -#include "app/gfx/canvas.h" #include "app/throb_animation.h" +#include "gfx/canvas.h" #include "gfx/skbitmap_operations.h" namespace views { diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 4c9f0fe..4a1e28a 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -5,9 +5,9 @@ #include "views/controls/button/menu_button.h" #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "gfx/canvas.h" #include "grit/app_strings.h" #include "grit/app_resources.h" #include "views/controls/button/button.h" diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h index 57f42a0..3895b03 100644 --- a/views/controls/button/menu_button.h +++ b/views/controls/button/menu_button.h @@ -7,8 +7,8 @@ #include <string> -#include "app/gfx/font.h" #include "base/time.h" +#include "gfx/font.h" #include "views/background.h" #include "views/controls/button/text_button.h" diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h index f69b2b6..4b6d06f 100644 --- a/views/controls/button/native_button.h +++ b/views/controls/button/native_button.h @@ -5,7 +5,7 @@ #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ #define VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" #include "views/controls/button/button.h" #include "views/controls/button/native_button_wrapper.h" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index ca0954d..2442d31 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -6,9 +6,9 @@ #include <algorithm> -#include "app/gfx/canvas.h" #include "app/throb_animation.h" #include "app/resource_bundle.h" +#include "gfx/canvas.h" #include "views/controls/button/button.h" #include "views/event.h" #include "grit/app_resources.h" diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h index b6bd739..f59b2a7 100644 --- a/views/controls/button/text_button.h +++ b/views/controls/button/text_button.h @@ -5,7 +5,7 @@ #ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "views/border.h" diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc index c95520e..13f1912 100644 --- a/views/controls/combobox/native_combobox_win.cc +++ b/views/controls/combobox/native_combobox_win.cc @@ -5,10 +5,10 @@ #include "views/controls/combobox/native_combobox_win.h" #include "app/combobox_model.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/i18n/rtl.h" +#include "gfx/font.h" #include "gfx/native_theme_win.h" #include "views/controls/combobox/combobox.h" #include "views/widget/widget.h" diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc index c215740..4217fe1 100644 --- a/views/controls/image_view.cc +++ b/views/controls/image_view.cc @@ -4,8 +4,8 @@ #include "views/controls/image_view.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "gfx/insets.h" namespace views { diff --git a/views/controls/label.cc b/views/controls/label.cc index e4f61fa..3a21509 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -7,15 +7,15 @@ #include <math.h> #include <limits> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/text_elider.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" +#include "gfx/font.h" #include "gfx/insets.h" #include "views/background.h" diff --git a/views/controls/label.h b/views/controls/label.h index 2249a82..23ba9ee 100644 --- a/views/controls/label.h +++ b/views/controls/label.h @@ -5,7 +5,7 @@ #ifndef VIEWS_CONTROLS_LABEL_H_ #define VIEWS_CONTROLS_LABEL_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkColor.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index 05c204c..a283333 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/border.h" #include "views/controls/label.h" diff --git a/views/controls/link.cc b/views/controls/link.cc index 72d5c29..bf90fea 100644 --- a/views/controls/link.cc +++ b/views/controls/link.cc @@ -8,10 +8,10 @@ #include <gdk/gdk.h> #endif -#include "app/gfx/font.h" #include "base/keyboard_codes.h" #include "base/logging.h" #include "gfx/color_utils.h" +#include "gfx/font.h" #include "views/event.h" namespace { diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h index a502b8a..eafbed1 100644 --- a/views/controls/menu/menu_config.h +++ b/views/controls/menu/menu_config.h @@ -5,7 +5,7 @@ #ifndef VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" namespace views { diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index a1fd9ad..625199d 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -4,12 +4,12 @@ #include "views/controls/menu/menu_controller.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "base/i18n/rtl.h" #include "base/keyboard_codes.h" #include "base/time.h" +#include "gfx/canvas.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_scroll_view_container.h" #include "views/controls/menu/submenu_view.h" diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index 95e22d0..62243e7 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -4,8 +4,8 @@ #include "views/controls/menu/menu_item_view.h" -#include "app/gfx/canvas.h" #include "app/l10n_util.h" +#include "gfx/canvas.h" #include "grit/app_strings.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_controller.h" diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 1e8745a..9b2095c 100644 --- a/views/controls/menu/menu_item_view_gtk.cc +++ b/views/controls/menu/menu_item_view_gtk.cc @@ -4,8 +4,8 @@ #include "views/controls/menu/menu_item_view.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" +#include "gfx/canvas.h" #include "gfx/favicon_size.h" #include "grit/app_resources.h" #include "views/controls/button/text_button.h" diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc index f3b8123..489fe90 100644 --- a/views/controls/menu/menu_item_view_win.cc +++ b/views/controls/menu/menu_item_view_win.cc @@ -8,8 +8,8 @@ #include <uxtheme.h> #include <Vssym32.h> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "grit/app_strings.h" #include "views/controls/menu/menu_config.h" diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc index df6e835..efd47ca 100644 --- a/views/controls/menu/menu_scroll_view_container.cc +++ b/views/controls/menu/menu_scroll_view_container.cc @@ -10,7 +10,7 @@ #include <Vssym32.h> #endif -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" #include "views/border.h" #include "views/controls/menu/menu_config.h" diff --git a/views/controls/menu/menu_separator_gtk.cc b/views/controls/menu/menu_separator_gtk.cc index d0b7fba..628cd92 100644 --- a/views/controls/menu/menu_separator_gtk.cc +++ b/views/controls/menu/menu_separator_gtk.cc @@ -4,7 +4,7 @@ #include "views/controls/menu/menu_separator.h" -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "third_party/skia/include/core/SkColor.h" #include "views/controls/menu/menu_config.h" diff --git a/views/controls/menu/menu_separator_win.cc b/views/controls/menu/menu_separator_win.cc index fdca5e3..58e2bb4 100644 --- a/views/controls/menu/menu_separator_win.cc +++ b/views/controls/menu/menu_separator_win.cc @@ -8,7 +8,7 @@ #include <uxtheme.h> #include <Vssym32.h> -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_item_view.h" diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index 01eed94..b941788 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -6,8 +6,6 @@ #include <string> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/win/window_impl.h" @@ -15,6 +13,8 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/rect.h" #include "views/accelerator.h" diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index f551ed6..a910a76 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -8,7 +8,6 @@ #include <map> #include <string> -#include "app/gfx/font.h" #include "app/menus/menu_model.h" #include "base/i18n/rtl.h" #include "base/keyboard_code_conversion_gtk.h" @@ -16,6 +15,7 @@ #include "base/message_loop.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "gfx/font.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/accelerator.h" diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 75b8d4c..3470e27 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -4,13 +4,13 @@ #include "views/controls/menu/native_menu_win.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "base/keyboard_codes.h" #include "base/logging.h" #include "base/stl_util-inl.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/accelerator.h" #include "views/controls/menu/menu_2.h" diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc index 14aae44..8136794 100644 --- a/views/controls/menu/submenu_view.cc +++ b/views/controls/menu/submenu_view.cc @@ -4,7 +4,7 @@ #include "views/controls/menu/submenu_view.h" -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_scroll_view_container.h" #include "views/widget/root_view.h" diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc index 463f149..bf6dd7f 100644 --- a/views/controls/native/native_view_host.cc +++ b/views/controls/native/native_view_host.cc @@ -5,7 +5,7 @@ #include "views/controls/native/native_view_host.h" #include "base/logging.h" -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "views/controls/native/native_view_host_wrapper.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc index 75045ab..87c6c3b 100644 --- a/views/controls/native/native_view_host_win.cc +++ b/views/controls/native/native_view_host_win.cc @@ -4,8 +4,8 @@ #include "views/controls/native/native_view_host_win.h" -#include "app/gfx/canvas.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "views/controls/native/native_view_host.h" #include "views/focus/focus_manager.h" #include "views/widget/root_view.h" diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc index 3ef04ab..4c0cb33 100644 --- a/views/controls/progress_bar.cc +++ b/views/controls/progress_bar.cc @@ -6,13 +6,13 @@ #include <string> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" +#include "gfx/canvas.h" #include "gfx/color_utils.h" +#include "gfx/font.h" #include "gfx/insets.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index bccf9a1..d5ac40c 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -8,12 +8,12 @@ #include "views/screen.h" #endif -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/keyboard_codes.h" #include "base/message_loop.h" +#include "gfx/canvas.h" #include "grit/app_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/controls/menu/menu.h" diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc index 10dc967..73feef2 100644 --- a/views/controls/single_split_view.cc +++ b/views/controls/single_split_view.cc @@ -8,7 +8,7 @@ #include <gdk/gdk.h> #endif -#include "app/gfx/canvas.h" +#include "gfx/canvas.h" #include "skia/ext/skia_utils_win.h" #include "views/background.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index dfe1e29..8900de3 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -6,12 +6,12 @@ #include <gtk/gtk.h> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/skia_utils_gtk.h" #include "views/background.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index a835e05..7426f72 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -6,12 +6,12 @@ #include <vssym32.h> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/stl_util-inl.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/native_theme_win.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/fill_layout.h" diff --git a/views/controls/table/group_table_view.cc b/views/controls/table/group_table_view.cc index 84573a9..14a5eae 100644 --- a/views/controls/table/group_table_view.cc +++ b/views/controls/table/group_table_view.cc @@ -4,10 +4,10 @@ #include "views/controls/table/group_table_view.h" -#include "app/gfx/canvas.h" #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/task.h" +#include "gfx/canvas.h" namespace views { diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc index e030dbf..f0a212f 100644 --- a/views/controls/table/native_table_win.cc +++ b/views/controls/table/native_table_win.cc @@ -7,12 +7,12 @@ #include <commctrl.h> #include <windowsx.h> -#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/table_model.h" #include "base/logging.h" #include "base/win_util.h" +#include "gfx/canvas.h" #include "gfx/favicon_size.h" #include "gfx/icon_util.h" #include "skia/ext/skia_utils_win.h" diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index 3d1acd1..711a707 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -9,8 +9,6 @@ #include <algorithm> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -18,7 +16,9 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/win_util.h" +#include "gfx/canvas.h" #include "gfx/favicon_size.h" +#include "gfx/font.h" #include "gfx/icon_util.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h index 71bdf49..eed9feb 100644 --- a/views/controls/textfield/textfield.h +++ b/views/controls/textfield/textfield.h @@ -11,10 +11,10 @@ #include <string> -#include "app/gfx/font.h" #include "base/basictypes.h" #include "base/keyboard_codes.h" #include "base/string16.h" +#include "gfx/font.h" #include "views/view.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc index 2a4e324..bc5fa04 100644 --- a/views/controls/throbber.cc +++ b/views/controls/throbber.cc @@ -4,9 +4,9 @@ #include "views/controls/throbber.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/time.h" +#include "gfx/canvas.h" #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index f70ac17..f5afcce 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -6,8 +6,6 @@ #include <vector> -#include "app/gfx/canvas.h" -#include "app/gfx/canvas_paint.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/resource_bundle.h" @@ -15,6 +13,8 @@ #include "base/keyboard_codes.h" #include "base/stl_util-inl.h" #include "base/win_util.h" +#include "gfx/canvas.h" +#include "gfx/canvas_paint.h" #include "gfx/favicon_size.h" #include "gfx/icon_util.h" #include "gfx/point.h" diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 3344b4e..73ecedb 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -4,14 +4,14 @@ #include "views/drag_utils.h" -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "googleurl/src/gurl.h" #include "grit/app_resources.h" #include "views/controls/button/text_button.h" diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc index a119d8f..a22b0cf 100644 --- a/views/drag_utils_gtk.cc +++ b/views/drag_utils_gtk.cc @@ -6,10 +6,10 @@ #include <gtk/gtk.h> -#include "app/gfx/canvas.h" #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_gtk.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "gfx/gtk_util.h" #include "gfx/point.h" #include "gfx/size.h" diff --git a/views/drag_utils_win.cc b/views/drag_utils_win.cc index 0c559a7..74663a6 100644 --- a/views/drag_utils_win.cc +++ b/views/drag_utils_win.cc @@ -8,9 +8,9 @@ #include <shlobj.h> #include <shobjidl.h> -#include "app/gfx/canvas.h" #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_win.h" +#include "gfx/canvas.h" #include "gfx/gdi_util.h" namespace drag_utils { diff --git a/views/painter.cc b/views/painter.cc index df17ce9..8b90dfd 100644 --- a/views/painter.cc +++ b/views/painter.cc @@ -4,9 +4,9 @@ #include "views/painter.h" -#include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "gfx/canvas.h" #include "gfx/insets.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/views/view.cc b/views/view.cc index a35cf49..a03378e 100644 --- a/views/view.cc +++ b/views/view.cc @@ -10,12 +10,12 @@ #endif #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" #include "base/utf_string_conversions.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "third_party/skia/include/core/SkShader.h" #include "views/background.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index eb2d4bc..8832c43 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -5,10 +5,10 @@ #include <map> #include "app/clipboard/clipboard.h" -#include "app/gfx/canvas.h" #include "base/keyboard_codes.h" #include "base/message_loop.h" #include "base/string_util.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/background.h" diff --git a/views/view_win.cc b/views/view_win.cc index 0d4ccb1..bce8fa8 100644 --- a/views/view_win.cc +++ b/views/view_win.cc @@ -5,8 +5,8 @@ #include "views/view.h" #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "base/string_util.h" +#include "gfx/canvas.h" #include "gfx/path.h" #include "views/accessibility/view_accessibility_wrapper.h" #include "views/border.h" diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index 5a8bb74..fcfdf4f 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -7,10 +7,10 @@ #include <algorithm> #include "app/drag_drop_types.h" -#include "app/gfx/canvas.h" #include "base/keyboard_codes.h" #include "base/logging.h" #include "base/message_loop.h" +#include "gfx/canvas.h" #include "views/fill_layout.h" #include "views/focus/view_storage.h" #include "views/widget/widget.h" diff --git a/views/widget/root_view_gtk.cc b/views/widget/root_view_gtk.cc index e284313..75438fb 100644 --- a/views/widget/root_view_gtk.cc +++ b/views/widget/root_view_gtk.cc @@ -6,8 +6,8 @@ #include <gtk/gtk.h> -#include "app/gfx/canvas_paint.h" #include "base/logging.h" +#include "gfx/canvas_paint.h" #include "views/widget/widget_gtk.h" namespace views { diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc index 65aa1b7..9535fd8 100644 --- a/views/widget/root_view_win.cc +++ b/views/widget/root_view_win.cc @@ -5,11 +5,11 @@ #include "views/widget/root_view.h" #include "app/drag_drop_types.h" -#include "app/gfx/canvas_paint.h" #include "app/os_exchange_data.h" #include "app/os_exchange_data_provider_win.h" #include "base/base_drag_source.h" #include "base/logging.h" +#include "gfx/canvas_paint.h" namespace views { diff --git a/views/widget/tooltip_manager_gtk.cc b/views/widget/tooltip_manager_gtk.cc index 5358173..255f1ca 100644 --- a/views/widget/tooltip_manager_gtk.cc +++ b/views/widget/tooltip_manager_gtk.cc @@ -4,9 +4,9 @@ #include "views/widget/tooltip_manager_gtk.h" -#include "app/gfx/font.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "gfx/font.h" #include "views/focus/focus_manager.h" #include "views/screen.h" #include "views/widget/root_view.h" diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc index 137d32c..a8285da 100644 --- a/views/widget/tooltip_manager_win.cc +++ b/views/widget/tooltip_manager_win.cc @@ -7,13 +7,13 @@ #include <windowsx.h> #include <limits> -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" #include "app/win_util.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" +#include "gfx/font.h" #include "views/screen.h" #include "views/view.h" #include "views/widget/root_view.h" diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 1f574e2..99e6395 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -4,12 +4,12 @@ #include "views/widget/widget_win.h" -#include "app/gfx/canvas.h" #include "app/l10n_util_win.h" #include "app/system_monitor.h" #include "app/win_util.h" #include "base/string_util.h" #include "base/win_util.h" +#include "gfx/canvas.h" #include "gfx/native_theme_win.h" #include "gfx/path.h" #include "views/accessibility/view_accessibility.h" diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index d3d256f..cf0fc49 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -4,8 +4,6 @@ #include "views/window/custom_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" @@ -13,6 +11,8 @@ #include "app/win_util.h" #include "base/win_util.h" #endif +#include "gfx/canvas.h" +#include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/app_strings.h" diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 13ecc8c..8b32d63 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -14,11 +14,11 @@ #include <algorithm> -#include "app/gfx/canvas.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" +#include "gfx/canvas.h" +#include "gfx/font.h" #include "grit/app_strings.h" #include "views/controls/button/native_button.h" #include "views/standard_layout.h" diff --git a/views/window/dialog_client_view.h b/views/window/dialog_client_view.h index 193ce1f..470481c 100644 --- a/views/window/dialog_client_view.h +++ b/views/window/dialog_client_view.h @@ -5,7 +5,7 @@ #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ -#include "app/gfx/font.h" +#include "gfx/font.h" #include "views/focus/focus_manager.h" #include "views/controls/button/button.h" #include "views/window/client_view.h" diff --git a/views/window/window.cc b/views/window/window.cc index 99bda55..522050f 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -4,10 +4,10 @@ #include "views/window/window.h" -#include "app/gfx/font.h" #include "app/gfx/font_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" +#include "gfx/font.h" #include "gfx/size.h" #include "views/widget/widget.h" diff --git a/views/window/window_win.cc b/views/window/window_win.cc index b58bcd4..4013523d9 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -7,14 +7,14 @@ #include <dwmapi.h> #include <shellapi.h> -#include "app/gfx/canvas_paint.h" -#include "app/gfx/font.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "app/win_util.h" #include "base/i18n/rtl.h" #include "base/win_util.h" +#include "gfx/canvas_paint.h" +#include "gfx/font.h" #include "gfx/icon_util.h" #include "gfx/path.h" #include "views/widget/root_view.h" |