diff options
Diffstat (limited to 'chrome/browser/ui/gtk')
76 files changed, 125 insertions, 125 deletions
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc index 605a7705..b3d7417 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc @@ -38,14 +38,14 @@ #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmark_bar_gtk.h index a898b58..3ac4298 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.h @@ -21,10 +21,10 @@ #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/point.h" -#include "gfx/size.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/point.h" +#include "ui/gfx/size.h" class BookmarkMenuController; class Browser; diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc index 31fab64..b4c3429 100644 --- a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc @@ -19,14 +19,14 @@ #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" -#include "gfx/point.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/point.h" #if defined(TOOLKIT_VIEWS) #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc index 1bced32..aaac8d8 100644 --- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc @@ -17,12 +17,12 @@ #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/menu_gtk.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" #include "webkit/glue/window_open_disposition.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc index e96dec7..3b0b259 100644 --- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc @@ -15,12 +15,12 @@ #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/font.h" -#include "gfx/gtk_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/font.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 761a85c..8c4455f 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -32,10 +32,10 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 738f5d6..dab1f7fa 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -35,13 +35,13 @@ #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "gfx/gtk_util.h" -#include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 6ff777e..d30c8c7 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -44,15 +44,15 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/gtk_util.h" -#include "gfx/skbitmap_operations.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/accelerator_gtk.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index baa6be5..568306c 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -79,15 +79,15 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "gfx/gtk_util.h" -#include "gfx/rect.h" -#include "gfx/skia_utils_gtk.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/skia_utils_gtk.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h index 9c90937..7d0ec5f 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.h +++ b/chrome/browser/ui/gtk/browser_window_gtk.h @@ -18,10 +18,10 @@ #include "chrome/browser/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/gtk/infobars/infobar_arrow_model.h" #include "chrome/common/notification_registrar.h" -#include "gfx/rect.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/x/active_window_watcher_x.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/rect.h" class BookmarkBarGtk; class Browser; diff --git a/chrome/browser/ui/gtk/certificate_viewer.cc b/chrome/browser/ui/gtk/certificate_viewer.cc index ca2244f..ab64d2a 100644 --- a/chrome/browser/ui/gtk/certificate_viewer.cc +++ b/chrome/browser/ui/gtk/certificate_viewer.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/gtk/certificate_dialogs.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/net/x509_certificate_model.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/certificate_viewer.h b/chrome/browser/ui/gtk/certificate_viewer.h index cbe2295..c31477c 100644 --- a/chrome/browser/ui/gtk/certificate_viewer.h +++ b/chrome/browser/ui/gtk/certificate_viewer.h @@ -7,8 +7,8 @@ #pragma once #include "chrome/browser/certificate_viewer.h" -#include "gfx/native_widget_types.h" #include "net/base/x509_certificate.h" +#include "ui/gfx/native_widget_types.h" void ShowCertificateViewer(gfx::NativeWindow parent, net::X509Certificate::OSCertHandle); diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc index a8aa95f..ea869ff 100644 --- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" #include "chrome/common/notification_source.h" -#include "gfx/rect.h" #include "ipc/ipc_message.h" +#include "ui/gfx/rect.h" class ConstrainedHtmlDelegateGtk : public ConstrainedWindowGtkDelegate, public HtmlDialogTabContentsDelegate, diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc index b9d8143..b47770e 100644 --- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc @@ -22,11 +22,11 @@ #include "chrome/common/content_settings.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/gtk_util.h" #include "webkit/plugins/npapi/plugin_list.h" namespace { diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index e9a689e..c650d86 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -16,11 +16,11 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" -#include "gfx/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc index a838c21..05da776 100644 --- a/chrome/browser/ui/gtk/custom_button.cc +++ b/chrome/browser/ui/gtk/custom_button.cc @@ -10,11 +10,11 @@ #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_service.h" -#include "gfx/gtk_util.h" -#include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/skbitmap_operations.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, int normal_id, diff --git a/chrome/browser/ui/gtk/custom_button.h b/chrome/browser/ui/gtk/custom_button.h index 87c28d3..75f20a8 100644 --- a/chrome/browser/ui/gtk/custom_button.h +++ b/chrome/browser/ui/gtk/custom_button.h @@ -12,11 +12,11 @@ #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/rect.h" class CairoCachedSurface; class GtkThemeProvider; diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc index eb786b3..8b8edb9 100644 --- a/chrome/browser/ui/gtk/custom_drag.cc +++ b/chrome/browser/ui/gtk/custom_drag.cc @@ -7,11 +7,11 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" -#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/download_item_gtk.cc b/chrome/browser/ui/gtk/download_item_gtk.cc index 1543ed8..27a2e06 100644 --- a/chrome/browser/ui/gtk/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download_item_gtk.cc @@ -24,10 +24,6 @@ #include "chrome/browser/ui/gtk/menu_gtk.h" #include "chrome/browser/ui/gtk/nine_box.h" #include "chrome/common/notification_service.h" -#include "gfx/canvas_skia_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" #include "third_party/skia/include/core/SkBitmap.h" @@ -35,6 +31,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/font.h" +#include "ui/gfx/skia_utils_gtk.h" namespace { diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download_shelf_gtk.cc index baaf900..224d1e7 100644 --- a/chrome/browser/ui/gtk/download_shelf_gtk.cc +++ b/chrome/browser/ui/gtk/download_shelf_gtk.cc @@ -18,14 +18,14 @@ #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_service.h" -#include "gfx/gtk_util.h" -#include "gfx/insets.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/insets.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.h b/chrome/browser/ui/gtk/download_shelf_gtk.h index d760f89..384943e 100644 --- a/chrome/browser/ui/gtk/download_shelf_gtk.h +++ b/chrome/browser/ui/gtk/download_shelf_gtk.h @@ -17,8 +17,8 @@ #include "chrome/browser/ui/gtk/slide_animator_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/native_widget_types.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/native_widget_types.h" class BaseDownloadItemModel; class Browser; diff --git a/chrome/browser/ui/gtk/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download_started_animation_gtk.cc index abcdcc5..e806316 100644 --- a/chrome/browser/ui/gtk/download_started_animation_gtk.cc +++ b/chrome/browser/ui/gtk/download_started_animation_gtk.cc @@ -10,10 +10,10 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" -#include "gfx/rect.h" #include "grit/theme_resources.h" #include "ui/base/animation/linear_animation.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/extension_infobar_gtk.cc index fbde501..aa2053e 100644 --- a/chrome/browser/ui/gtk/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/extension_infobar_gtk.cc @@ -10,9 +10,9 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "gfx/gtk_util.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" ExtensionInfoBarGtk::ExtensionInfoBarGtk(ExtensionInfoBarDelegate* delegate) : InfoBar(delegate), diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.h b/chrome/browser/ui/gtk/extension_infobar_gtk.h index f86c4bf..760c4e8 100644 --- a/chrome/browser/ui/gtk/extension_infobar_gtk.h +++ b/chrome/browser/ui/gtk/extension_infobar_gtk.h @@ -10,7 +10,7 @@ #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/gtk/extension_view_gtk.h" #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" class ExtensionInfobarDelegate; class ExtensionResource; diff --git a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc index c1a46c7a..f2cda7d 100644 --- a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc +++ b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc @@ -12,10 +12,10 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/extensions/extension.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" class Profile; diff --git a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc index 70c89cd..9790ced 100644 --- a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc @@ -15,9 +15,9 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/extensions/extension.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" class Profile; diff --git a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc index 565de03..3afb1ea 100644 --- a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc @@ -21,11 +21,11 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/extension_popup_gtk.h b/chrome/browser/ui/gtk/extension_popup_gtk.h index 14c1686..c28843d 100644 --- a/chrome/browser/ui/gtk/extension_popup_gtk.h +++ b/chrome/browser/ui/gtk/extension_popup_gtk.h @@ -12,7 +12,7 @@ #include "chrome/browser/ui/gtk/info_bubble_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" class Browser; class ExtensionHost; diff --git a/chrome/browser/ui/gtk/extension_view_gtk.h b/chrome/browser/ui/gtk/extension_view_gtk.h index c398fed..c0dccfa 100644 --- a/chrome/browser/ui/gtk/extension_view_gtk.h +++ b/chrome/browser/ui/gtk/extension_view_gtk.h @@ -7,9 +7,9 @@ #pragma once #include "base/basictypes.h" -#include "gfx/native_widget_types.h" -#include "gfx/size.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/size.h" class Browser; class ExtensionHost; diff --git a/chrome/browser/ui/gtk/find_bar_gtk.h b/chrome/browser/ui/gtk/find_bar_gtk.h index 2660298..446bf99 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.h +++ b/chrome/browser/ui/gtk/find_bar_gtk.h @@ -16,7 +16,7 @@ #include "chrome/browser/ui/gtk/slide_animator_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/point.h" +#include "ui/gfx/point.h" class Browser; class BrowserWindowGtk; diff --git a/chrome/browser/ui/gtk/gtk_chrome_button.cc b/chrome/browser/ui/gtk/gtk_chrome_button.cc index 721fd97..b08427a 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_button.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_button.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "chrome/browser/ui/gtk/nine_box.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc index b8f5a4e..c31a2c1 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc @@ -7,7 +7,7 @@ #include <stdlib.h> #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" static const gchar* kLinkMarkup = "<u><span color=\"%s\">%s</span></u>"; diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.cc b/chrome/browser/ui/gtk/gtk_theme_provider.cc index 1cdc020..d0227ae 100644 --- a/chrome/browser/ui/gtk/gtk_theme_provider.cc +++ b/chrome/browser/ui/gtk/gtk_theme_provider.cc @@ -24,12 +24,6 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" -#include "gfx/canvas_skia.h" -#include "gfx/color_utils.h" -#include "gfx/gtk_util.h" -#include "gfx/skbitmap_operations.h" -#include "gfx/skia_util.h" -#include "gfx/skia_utils_gtk.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -38,6 +32,12 @@ #include "third_party/skia/include/core/SkShader.h" #include "ui/base/gtk/gtk_signal_registrar.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/skbitmap_operations.h" +#include "ui/gfx/skia_util.h" +#include "ui/gfx/skia_utils_gtk.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.h b/chrome/browser/ui/gtk/gtk_theme_provider.h index b6a9e67..90c4e78 100644 --- a/chrome/browser/ui/gtk/gtk_theme_provider.h +++ b/chrome/browser/ui/gtk/gtk_theme_provider.h @@ -14,9 +14,9 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/notification_observer.h" -#include "gfx/color_utils.h" #include "ui/base/gtk/gtk_integers.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/color_utils.h" class CairoCachedSurface; class Profile; diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc index 035d38b..7c16ac9 100644 --- a/chrome/browser/ui/gtk/gtk_tree.cc +++ b/chrome/browser/ui/gtk/gtk_tree.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model.h" +#include "ui/gfx/gtk_util.h" namespace gtk_tree { diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index f9bc5d4..16ee8d1 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -30,7 +30,6 @@ #include "chrome/browser/ui/gtk/cairo_cached_surface.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/common/renderer_preferences.h" -#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -38,6 +37,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/gtk_util.h" using WebKit::WebDragOperationsMask; using WebKit::WebDragOperation; diff --git a/chrome/browser/ui/gtk/gtk_util.h b/chrome/browser/ui/gtk/gtk_util.h index d51a616..d88ecdc 100644 --- a/chrome/browser/ui/gtk/gtk_util.h +++ b/chrome/browser/ui/gtk/gtk_util.h @@ -11,10 +11,10 @@ #include <vector> #include "base/string16.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" #include "webkit/glue/window_open_disposition.h" typedef struct _cairo cairo_t; diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.h b/chrome/browser/ui/gtk/html_dialog_gtk.h index 48f87db..a222a60 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.h +++ b/chrome/browser/ui/gtk/html_dialog_gtk.h @@ -12,9 +12,9 @@ #include "base/scoped_ptr.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h" -#include "gfx/native_widget_types.h" -#include "gfx/size.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/size.h" typedef struct _GtkWidget GtkWidget; diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 6ed0c69..fc41e24 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -15,13 +15,13 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" -#include "gfx/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/info_bubble_gtk.cc b/chrome/browser/ui/gtk/info_bubble_gtk.cc index beaf56e..3b0c69b 100644 --- a/chrome/browser/ui/gtk/info_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/info_bubble_gtk.cc @@ -13,9 +13,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/info_bubble_accelerators_gtk.h" #include "chrome/common/notification_service.h" -#include "gfx/gtk_util.h" -#include "gfx/path.h" -#include "gfx/rect.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/path.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/browser/ui/gtk/info_bubble_gtk.h b/chrome/browser/ui/gtk/info_bubble_gtk.h index 8bc4aab..e680df7 100644 --- a/chrome/browser/ui/gtk/info_bubble_gtk.h +++ b/chrome/browser/ui/gtk/info_bubble_gtk.h @@ -20,10 +20,10 @@ #include "base/basictypes.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" class GtkThemeProvider; class InfoBubbleGtk; diff --git a/chrome/browser/ui/gtk/infobars/infobar_arrow_model.cc b/chrome/browser/ui/gtk/infobars/infobar_arrow_model.cc index 0e8fbd2..e448f78 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_arrow_model.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_arrow_model.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/gtk/infobars/infobar_arrow_model.h" #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/color_utils.h" -#include "gfx/point.h" -#include "gfx/skia_utils_gtk.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/point.h" +#include "ui/gfx/skia_utils_gtk.h" InfoBarArrowModel::InfoBarArrowModel(Observer* observer) : observer_(observer), diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc index aa080e4..07d54e5 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" #include "chrome/common/notification_service.h" -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" extern const int InfoBar::kInfoBarHeight = 37; diff --git a/chrome/browser/ui/gtk/js_modal_dialog_gtk.h b/chrome/browser/ui/gtk/js_modal_dialog_gtk.h index 7952309..5626651 100644 --- a/chrome/browser/ui/gtk/js_modal_dialog_gtk.h +++ b/chrome/browser/ui/gtk/js_modal_dialog_gtk.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" -#include "gfx/native_widget_types.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/native_widget_types.h" typedef struct _GtkWidget GtkWidget; diff --git a/chrome/browser/ui/gtk/keyword_editor_view.cc b/chrome/browser/ui/gtk/keyword_editor_view.cc index 78eda6c..608f9c7 100644 --- a/chrome/browser/ui/gtk/keyword_editor_view.cc +++ b/chrome/browser/ui/gtk/keyword_editor_view.cc @@ -18,11 +18,11 @@ #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h" #include "chrome/browser/ui/gtk/gtk_tree.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 63f99825..4fc55aa 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -52,15 +52,15 @@ #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/font.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/font.h" +#include "ui/gfx/gtk_util.h" #include "webkit/glue/window_open_disposition.h" namespace { diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index 49ca7a1..c3e6eec 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -15,11 +15,11 @@ #include "chrome/browser/ui/gtk/gtk_custom_menu.h" #include "chrome/browser/ui/gtk/gtk_custom_menu_item.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/accelerator_gtk.h" #include "ui/base/models/button_menu_item_model.h" #include "ui/base/models/menu_model.h" +#include "ui/gfx/gtk_util.h" #include "webkit/glue/window_open_disposition.h" bool MenuGtk::block_activation_ = false; diff --git a/chrome/browser/ui/gtk/menu_gtk.h b/chrome/browser/ui/gtk/menu_gtk.h index fc9a048..58138f2 100644 --- a/chrome/browser/ui/gtk/menu_gtk.h +++ b/chrome/browser/ui/gtk/menu_gtk.h @@ -12,8 +12,8 @@ #include <vector> #include "base/task.h" -#include "gfx/point.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/point.h" class SkBitmap; diff --git a/chrome/browser/ui/gtk/nine_box.cc b/chrome/browser/ui/gtk/nine_box.cc index 3295c85..8956195 100644 --- a/chrome/browser/ui/gtk/nine_box.cc +++ b/chrome/browser/ui/gtk/nine_box.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" -#include "gfx/gtk_util.h" -#include "gfx/point.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/point.h" namespace { diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index d760f36..f9bf94f 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -35,14 +35,14 @@ #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" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/insets.h" +#include "ui/gfx/native_widget_types.h" namespace { diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h index 97c5b78..9b02c0c 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h @@ -15,11 +15,11 @@ #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/point.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" class BalloonCollection; class CustomDrawButton; diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h index c013fa4..60b223c 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h +++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/notifications/balloon_host.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" class RenderWidgetHostViewGtk; diff --git a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc index 42e3d9c..a3edcf0 100644 --- a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc @@ -10,10 +10,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/options/content_exception_editor.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.cc b/chrome/browser/ui/gtk/options/content_page_gtk.cc index 9ba3d5a..e90e667 100644 --- a/chrome/browser/ui/gtk/options/content_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_page_gtk.cc @@ -24,12 +24,12 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/cookies_view.cc b/chrome/browser/ui/gtk/options/cookies_view.cc index 01610fe..dc7be33 100644 --- a/chrome/browser/ui/gtk/options/cookies_view.cc +++ b/chrome/browser/ui/gtk/options/cookies_view.cc @@ -13,10 +13,10 @@ #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc b/chrome/browser/ui/gtk/options/fonts_page_gtk.cc index cdafd31..32a9f3b 100644 --- a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/fonts_page_gtk.cc @@ -13,9 +13,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/options/options_layout_gtk.h" #include "chrome/common/pref_names.h" -#include "gfx/font.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/font.h" namespace { diff --git a/chrome/browser/ui/gtk/options/general_page_gtk.cc b/chrome/browser/ui/gtk/options/general_page_gtk.cc index 0f552ff..0d95420 100644 --- a/chrome/browser/ui/gtk/options/general_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/general_page_gtk.cc @@ -30,10 +30,10 @@ #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc index 013661e..2d21122 100644 --- a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc @@ -14,12 +14,12 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_page_gtk.cc index 2cc353c..6eb3b0b 100644 --- a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_page_gtk.cc @@ -16,12 +16,12 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc index d824b93..a8d9396 100644 --- a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc +++ b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc @@ -7,10 +7,10 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc index 78102ea6..76cb739 100644 --- a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h" #include "chrome/common/pref_names.h" -#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -23,6 +22,7 @@ #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index f5cefc0..bc5be25 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -21,11 +21,11 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/net/x509_certificate_model.h" -#include "gfx/native_widget_types.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/native_widget_types.h" namespace { diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.h b/chrome/browser/ui/gtk/status_bubble_gtk.h index 1e6c0b6..0608f7a 100644 --- a/chrome/browser/ui/gtk/status_bubble_gtk.h +++ b/chrome/browser/ui/gtk/status_bubble_gtk.h @@ -16,10 +16,10 @@ #include "chrome/browser/ui/status_bubble.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/point.h" #include "googleurl/src/gurl.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/point.h" class GtkThemeProvider; class Profile; diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc index 198a82a..1d66b6b 100644 --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc +++ b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/menu_gtk.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/gtk_util.h" StatusIconGtk::StatusIconGtk() { icon_ = gtk_status_icon_new(); diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc index aad9d2e..01cc890 100644 --- a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/status_bubble_gtk.h" #include "chrome/common/notification_source.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble) : tab_contents_(NULL), diff --git a/chrome/browser/ui/gtk/tab_contents_drag_source.cc b/chrome/browser/ui/gtk/tab_contents_drag_source.cc index 0739d34..2750bce 100644 --- a/chrome/browser/ui/gtk/tab_contents_drag_source.cc +++ b/chrome/browser/ui/gtk/tab_contents_drag_source.cc @@ -17,10 +17,10 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "gfx/gtk_util.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/gfx/gtk_util.h" #include "webkit/glue/webdropdata.h" using WebKit::WebDragOperation; diff --git a/chrome/browser/ui/gtk/tab_contents_drag_source.h b/chrome/browser/ui/gtk/tab_contents_drag_source.h index 52b66f7..1fa638c 100644 --- a/chrome/browser/ui/gtk/tab_contents_drag_source.h +++ b/chrome/browser/ui/gtk/tab_contents_drag_source.h @@ -12,12 +12,12 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/string16.h" -#include "gfx/point.h" -#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" class SkBitmap; class TabContents; diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc index 07ed920..c42cdff 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc @@ -17,9 +17,9 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" -#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h index 5ba35fd..c416b63 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h @@ -11,12 +11,12 @@ #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" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" class TabContents; class TabRendererGtk; diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_gtk.cc index 63f2af8..4614d19 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_gtk.cc @@ -12,11 +12,11 @@ #include "chrome/browser/ui/gtk/accelerators_gtk.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "chrome/browser/ui/tabs/tab_menu_model.h" -#include "gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/models/accelerator_gtk.h" +#include "ui/gfx/path.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 41ca2b6..3abd11b 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -17,10 +17,6 @@ #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_service.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/favicon_size.h" -#include "gfx/platform_font_gtk.h" -#include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -28,6 +24,10 @@ #include "ui/base/animation/throb_animation.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/favicon_size.h" +#include "ui/gfx/platform_font_gtk.h" +#include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h index 06e5510..97c061e 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h @@ -15,12 +15,12 @@ #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "gfx/canvas.h" -#include "gfx/font.h" -#include "gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/font.h" +#include "ui/gfx/rect.h" namespace gfx { class Size; diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index b94e1e2..18f4991 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -26,14 +26,14 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" -#include "gfx/gtk_util.h" -#include "gfx/point.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/point.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h index 0056e9e..b7849ae 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h @@ -18,8 +18,8 @@ #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/notification_observer.h" -#include "gfx/rect.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/gfx/rect.h" class BrowserWindowGtk; class CustomDrawButton; diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index 8365b65..69635a0 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -25,13 +25,13 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gtk_util.h" #if defined(TOOLKIT_VIEWS) #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc index c6c6d2d..9457ae6 100644 --- a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc +++ b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc @@ -12,10 +12,10 @@ #include "chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h" #include "chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h" #include "chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h" -#include "gfx/canvas.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/canvas.h" namespace { |