diff options
Diffstat (limited to 'chrome/browser')
142 files changed, 150 insertions, 152 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index f7f2203..bef5c4a 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -8,7 +8,6 @@ #include <shobjidl.h> #include "app/gfx/gdi_util.h" -#include "app/gfx/insets.h" #include "app/win_util.h" #include "app/win/window_impl.h" #include "base/command_line.h" diff --git a/chrome/browser/aeropeek_manager.h b/chrome/browser/aeropeek_manager.h index c68e2ea..80d60db 100644 --- a/chrome/browser/aeropeek_manager.h +++ b/chrome/browser/aeropeek_manager.h @@ -7,9 +7,9 @@ #include <list> -#include "app/gfx/insets.h" #include "base/waitable_event.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "gfx/insets.h" namespace gfx { class Size; diff --git a/chrome/browser/autocomplete/autocomplete_edit_view.h b/chrome/browser/autocomplete/autocomplete_edit_view.h index 2b8d78d..63c2524 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view.h @@ -13,8 +13,8 @@ #include <string> -#include "app/gfx/native_widget_types.h" #include "chrome/common/page_transition_types.h" +#include "gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditModel; diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 407ed10..207c70c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -12,7 +12,6 @@ #include "app/clipboard/clipboard.h" #include "app/clipboard/scoped_clipboard_writer.h" #include "app/gfx/font.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/toolbar_model.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 9f59d9c..da54e88 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -10,7 +10,6 @@ #include <string> #include "app/gfx/font.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -27,6 +26,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/gtk_util.h" #include "gfx/rect.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autofill/autofill_dialog_gtk.cc b/chrome/browser/autofill/autofill_dialog_gtk.cc index d3bcb80..afbd0c4 100644 --- a/chrome/browser/autofill/autofill_dialog_gtk.cc +++ b/chrome/browser/autofill/autofill_dialog_gtk.cc @@ -8,7 +8,6 @@ #include <vector> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" @@ -20,6 +19,7 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/profile.h" +#include "gfx/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/automation/automation_window_tracker.h b/chrome/browser/automation/automation_window_tracker.h index c69673e..02cfeea 100644 --- a/chrome/browser/automation/automation_window_tracker.h +++ b/chrome/browser/automation/automation_window_tracker.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_ #define CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_ -#include "app/gfx/native_widget_types.h" #include "build/build_config.h" #include "chrome/browser/automation/automation_resource_tracker.h" #include "chrome/common/native_window_notification_source.h" +#include "gfx/native_widget_types.h" class AutomationWindowTracker : public AutomationResourceTracker<gfx::NativeWindow> { diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h index f401273..f1d8a07 100644 --- a/chrome/browser/automation/ui_controls.h +++ b/chrome/browser/automation/ui_controls.h @@ -13,7 +13,7 @@ #include <wtypes.h> #endif -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" #include "gfx/point.h" #include "base/keyboard_codes.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h index 02888f2..b2776df 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h @@ -7,10 +7,10 @@ #include <vector> -#include "app/gfx/native_widget_types.h" #include "app/menus/simple_menu_model.h" #include "base/basictypes.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" +#include "gfx/native_widget_types.h" class Browser; class PageNavigator; diff --git a/chrome/browser/bookmarks/bookmark_drop_info.h b/chrome/browser/bookmarks/bookmark_drop_info.h index 77e68af..e09cf9c 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.h +++ b/chrome/browser/bookmarks/bookmark_drop_info.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_ -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/timer.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" +#include "gfx/native_widget_types.h" namespace views { class DropTargetEvent; diff --git a/chrome/browser/bookmarks/bookmark_editor.h b/chrome/browser/bookmarks/bookmark_editor.h index e935311..8b6445a 100644 --- a/chrome/browser/bookmarks/bookmark_editor.h +++ b/chrome/browser/bookmarks/bookmark_editor.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" class BookmarkNode; class GURL; diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h index 4366b44..7cf5e46 100644 --- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h +++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_PASTEBOARD_HELPER_MAC_H_ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_PASTEBOARD_HELPER_MAC_H_ -#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" +#include "gfx/native_widget_types.h" // This set of functions lets C++ code interact with the cocoa pasteboard // and dragging methods. diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index b001a69..db1bfda 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/history/snippet.h" +#include "gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" class BookmarkModel; diff --git a/chrome/browser/browser_theme_provider_gtk.cc b/chrome/browser/browser_theme_provider_gtk.cc index c52a9fe..cd8d26e 100644 --- a/chrome/browser/browser_theme_provider_gtk.cc +++ b/chrome/browser/browser_theme_provider_gtk.cc @@ -6,9 +6,9 @@ #include <gdk-pixbuf/gdk-pixbuf.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/logging.h" +#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" GdkPixbuf* BrowserThemeProvider::GetPixbufNamed(int id) const { diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 324d3cc..08e311a 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.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/native_widget_types.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/string_util.h" @@ -18,10 +17,11 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" -#include "net/base/net_util.h" -#include "net/url_request/url_request_unittest.h" +#include "gfx/native_widget_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "net/base/net_util.h" +#include "net/url_request/url_request_unittest.h" namespace { diff --git a/chrome/browser/browser_window.h b/chrome/browser/browser_window.h index 80ec716..a4ff572 100644 --- a/chrome/browser/browser_window.h +++ b/chrome/browser/browser_window.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_BROWSER_WINDOW_H_ #define CHROME_BROWSER_BROWSER_WINDOW_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/content_settings_types.h" +#include "gfx/native_widget_types.h" class Browser; class BrowserWindowTesting; diff --git a/chrome/browser/chromeos/app_launcher.cc b/chrome/browser/chromeos/app_launcher.cc index a43bb15..ea95e7a 100644 --- a/chrome/browser/chromeos/app_launcher.cc +++ b/chrome/browser/chromeos/app_launcher.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/insets.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -34,6 +33,7 @@ #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/bubble_border.h" +#include "gfx/insets.h" #include "gfx/point.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/compact_location_bar_host.h b/chrome/browser/chromeos/compact_location_bar_host.h index cb3e221..cf81115 100644 --- a/chrome/browser/chromeos/compact_location_bar_host.h +++ b/chrome/browser/chromeos/compact_location_bar_host.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_CHROMEOS_COMPACT_LOCATION_BAR_HOST_H_ #include "app/animation.h" -#include "app/gfx/native_widget_types.h" #include "base/timer.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/dropdown_bar_host.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc index 94df65a..f5887bc 100644 --- a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc +++ b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc @@ -6,7 +6,6 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -20,6 +19,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/x11_util.h" +#include "gfx/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h index bd89f8b..b350b76 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.h +++ b/chrome/browser/chromeos/notifications/balloon_view.h @@ -7,7 +7,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_H_ #define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_VIEW_H_ -#include "app/gfx/path.h" #include "app/menus/simple_menu_model.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" @@ -15,6 +14,7 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" +#include "gfx/path.h" #include "gfx/point.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/chromeos/status/status_area_host.h b/chrome/browser/chromeos/status/status_area_host.h index 606c041..1d6ab1a 100644 --- a/chrome/browser/chromeos/status/status_area_host.h +++ b/chrome/browser/chromeos/status/status_area_host.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_HOST_H_ #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_HOST_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" namespace views { class View; diff --git a/chrome/browser/cocoa/download_util_mac.mm b/chrome/browser/cocoa/download_util_mac.mm index 3c77f08..75a75ec 100644 --- a/chrome/browser/cocoa/download_util_mac.mm +++ b/chrome/browser/cocoa/download_util_mac.mm @@ -6,10 +6,10 @@ #include "chrome/browser/cocoa/download_util_mac.h" -#include "app/gfx/native_widget_types.h" #include "base/sys_string_conversions.h" #import "chrome/browser/cocoa/dock_icon.h" #include "chrome/browser/download/download_manager.h" +#include "gfx/native_widget_types.h" #include "skia/ext/skia_utils_mac.h" namespace download_util { diff --git a/chrome/browser/cocoa/extension_installed_bubble_bridge.h b/chrome/browser/cocoa/extension_installed_bubble_bridge.h index 7f933f3..f838fd5 100644 --- a/chrome/browser/cocoa/extension_installed_bubble_bridge.h +++ b/chrome/browser/cocoa/extension_installed_bubble_bridge.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_COCOA_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_ #define CHROME_BROWSER_COCOA_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" class Browser; diff --git a/chrome/browser/cocoa/extension_view_mac.h b/chrome/browser/cocoa/extension_view_mac.h index f4f8d74..34885c2 100644 --- a/chrome/browser/cocoa/extension_view_mac.h +++ b/chrome/browser/cocoa/extension_view_mac.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_COCOA_EXTENSION_VIEW_MAC_H_ #define CHROME_BROWSER_COCOA_EXTENSION_VIEW_MAC_H_ -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" +#include "gfx/native_widget_types.h" #include "gfx/size.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/cocoa/notifications/balloon_view_host_mac.h b/chrome/browser/cocoa/notifications/balloon_view_host_mac.h index 235ab3c..a6268d2 100644 --- a/chrome/browser/cocoa/notifications/balloon_view_host_mac.h +++ b/chrome/browser/cocoa/notifications/balloon_view_host_mac.h @@ -5,13 +5,13 @@ #ifndef CHROME_BROWSER_COCOA_NOTIFICATIONS_BALLOON_VIEW_HOST_MAC_H_ #define CHROME_BROWSER_COCOA_NOTIFICATIONS_BALLOON_VIEW_HOST_MAC_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #import "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" +#include "gfx/native_widget_types.h" #include "webkit/glue/webpreferences.h" class Profile; diff --git a/chrome/browser/dock_info.h b/chrome/browser/dock_info.h index 3130488..a207d79 100644 --- a/chrome/browser/dock_info.h +++ b/chrome/browser/dock_info.h @@ -7,7 +7,7 @@ #include <set> -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc index b831119..3b29395 100644 --- a/chrome/browser/dock_info_gtk.cc +++ b/chrome/browser/dock_info_gtk.cc @@ -6,13 +6,13 @@ #include <gtk/gtk.h> -#include "app/gfx/native_widget_types.h" #include "base/logging.h" #include "base/task.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/gtk_util.h" +#include "gfx/native_widget_types.h" //////////////////////////////////////////////////////////////////////////////// // BaseWindowFinder diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h index d4df8c4..caabee4 100644 --- a/chrome/browser/download/download_file.h +++ b/chrome/browser/download/download_file.h @@ -45,7 +45,6 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/hash_tables.h" @@ -54,6 +53,7 @@ #include "base/ref_counted.h" #include "base/timer.h" #include "chrome/browser/power_save_blocker.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index 9ba209b..d692a46 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -10,9 +10,9 @@ #include <set> #include <string> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/task.h" +#include "gfx/native_widget_types.h" #if defined(TOOLKIT_VIEWS) #include "views/view.h" diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index af62063..d87d22c 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -9,8 +9,8 @@ #include <set> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/ref_counted.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" class Browser; diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index fc3bdbb..05562e8 100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_UI_H_ -#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include <string> diff --git a/chrome/browser/extensions/extension_popup_host.h b/chrome/browser/extensions/extension_popup_host.h index c11568b..6f77b4d 100644 --- a/chrome/browser/extensions/extension_popup_host.h +++ b/chrome/browser/extensions/extension_popup_host.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_POPUP_HOST_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_POPUP_HOST_H_ -#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "build/build_config.h" @@ -14,6 +13,7 @@ #endif #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" #if defined(TOOLKIT_VIEWS) class ExtensionPopup; diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h index 7741e77..2bcecb0 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run.h @@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "chrome/browser/browser_process_impl.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" class CommandLine; diff --git a/chrome/browser/fonts_languages_window.h b/chrome/browser/fonts_languages_window.h index aab6b6b..bfb9bb7 100644 --- a/chrome/browser/fonts_languages_window.h +++ b/chrome/browser/fonts_languages_window.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FONTS_LANGUAGES_WINDOW_H_ #define CHROME_BROWSER_FONTS_LANGUAGES_WINDOW_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" class Profile; diff --git a/chrome/browser/gears_integration.h b/chrome/browser/gears_integration.h index 33264a7..1435641 100644 --- a/chrome/browser/gears_integration.h +++ b/chrome/browser/gears_integration.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_GEARS_INTEGRATION_H__ #define CHROME_BROWSER_GEARS_INTEGRATION_H__ -#include "app/gfx/native_widget_types.h" #include "base/callback.h" #include "base/string16.h" #include "chrome/common/gears_api.h" +#include "gfx/native_widget_types.h" // TODO(michaeln): Rework this interface to match how other first class // citizens of chrome are structured, as a GearsService with an accessor diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index 587d1f8..712228f 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" @@ -19,6 +18,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/platform_util.h" #include "chrome/common/url_constants.h" +#include "gfx/gtk_util.h" #include "grit/chromium_strings.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 027c4705..2ae1421 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/gtk_util.h" #include "app/gfx/canvas_paint.h" #include "app/gfx/text_elider.h" #include "app/gtk_dnd_util.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/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index b90003e..8c6e13a 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" @@ -22,6 +21,7 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc index c16164c..c968abe 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/gtk/bookmark_editor_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" @@ -20,6 +19,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" +#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc index 754e506..52eba7f 100644 --- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -19,6 +18,7 @@ #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" +#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc index 880731d..73b3feda 100644 --- a/chrome/browser/gtk/bookmark_utils_gtk.cc +++ b/chrome/browser/gtk/bookmark_utils_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/bookmark_utils_gtk.h" -#include "app/gfx/gtk_util.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -17,6 +16,7 @@ #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/profile.h" +#include "gfx/gtk_util.h" namespace { diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index 60c509f..621a42f 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/gfx/canvas_paint.h" -#include "app/gfx/gtk_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/extensions/extension_action_context_menu_model.h" #include "chrome/browser/extensions/extension_browser_event_router.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/gtk_util.h" #include "grit/app_resources.h" namespace { diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index d96a9a9..5c1130d 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/gfx/gtk_util.h" #include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -34,6 +33,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 7eed210..a3a5e5d 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -8,7 +8,6 @@ #include <gtk/gtk.h> #include <X11/XF86keysym.h> -#include "app/gfx/gtk_util.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" @@ -47,6 +46,7 @@ #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/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index b49d501..e2f3ec6 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -9,7 +9,6 @@ #include <string> #include "app/gfx/color_utils.h" -#include "app/gfx/gtk_util.h" #include "app/gfx/skia_utils_gtk.h" #include "app/gtk_util.h" #include "app/l10n_util.h" @@ -81,6 +80,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/gtk_util.h" #include "gfx/rect.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/certificate_manager.h b/chrome/browser/gtk/certificate_manager.h index 8dabbc2..96f3d89 100644 --- a/chrome/browser/gtk/certificate_manager.h +++ b/chrome/browser/gtk/certificate_manager.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GTK_CERTIFICATE_MANAGER_H_ #define CHROME_BROWSER_GTK_CERTIFICATE_MANAGER_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" void ShowCertificateManager(gfx::NativeWindow parent); diff --git a/chrome/browser/gtk/certificate_viewer.h b/chrome/browser/gtk/certificate_viewer.h index d4b412e..4f801c3 100644 --- a/chrome/browser/gtk/certificate_viewer.h +++ b/chrome/browser/gtk/certificate_viewer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GTK_CERTIFICATE_VIEWER_H_ #define CHROME_BROWSER_GTK_CERTIFICATE_VIEWER_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" typedef struct CERTCertificateStr CERTCertificate; diff --git a/chrome/browser/gtk/content_blocked_bubble_gtk.cc b/chrome/browser/gtk/content_blocked_bubble_gtk.cc index 11bc921..956e014 100644 --- a/chrome/browser/gtk/content_blocked_bubble_gtk.cc +++ b/chrome/browser/gtk/content_blocked_bubble_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/content_blocked_bubble_gtk.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "chrome/browser/blocked_popup_container.h" #include "chrome/browser/content_setting_bubble_model.h" @@ -18,6 +17,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index 1c2fe35..0514660 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/custom_button.h" -#include "app/gfx/gtk_util.h" #include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -15,6 +14,7 @@ #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "grit/theme_resources.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, diff --git a/chrome/browser/gtk/download_item_drag.cc b/chrome/browser/gtk/download_item_drag.cc index ed5a8dd..24c312e 100644 --- a/chrome/browser/gtk/download_item_drag.cc +++ b/chrome/browser/gtk/download_item_drag.cc @@ -4,10 +4,10 @@ #include "chrome/browser/gtk/download_item_drag.h" -#include "app/gfx/gtk_util.h" #include "app/gtk_dnd_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_manager.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" diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc index 6d82d86..9dfc552 100644 --- a/chrome/browser/gtk/download_shelf_gtk.cc +++ b/chrome/browser/gtk/download_shelf_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" @@ -19,6 +18,7 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/download_shelf_gtk.h b/chrome/browser/gtk/download_shelf_gtk.h index df2c4b0..71f10c4 100644 --- a/chrome/browser/gtk/download_shelf_gtk.h +++ b/chrome/browser/gtk/download_shelf_gtk.h @@ -9,13 +9,13 @@ #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/gtk/slide_animator_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" +#include "gfx/native_widget_types.h" class BaseDownloadItemModel; class Browser; diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc index ff5dc1a..5266a57 100644 --- a/chrome/browser/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc @@ -4,7 +4,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/rand_util.h" #include "base/string_util.h" @@ -14,6 +13,7 @@ #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/common/extensions/extension.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" class Profile; diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc index 1ab5d1d..8cf8bb2 100644 --- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/extension_installed_bubble_gtk.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" @@ -18,6 +17,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/extension_view_gtk.h b/chrome/browser/gtk/extension_view_gtk.h index 089f230..2d815d7 100644 --- a/chrome/browser/gtk/extension_view_gtk.h +++ b/chrome/browser/gtk/extension_view_gtk.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_GTK_EXTENSION_VIEW_GTK_H_ #define CHROME_BROWSER_GTK_EXTENSION_VIEW_GTK_H_ -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" +#include "gfx/native_widget_types.h" #include "gfx/size.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index 3f2f10c..965dcf9 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -6,7 +6,6 @@ #include <gdk/gdkkeysyms.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" @@ -27,6 +26,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" diff --git a/chrome/browser/gtk/first_run_bubble.cc b/chrome/browser/gtk/first_run_bubble.cc index eff6f9d..b2989d6 100644 --- a/chrome/browser/gtk/first_run_bubble.cc +++ b/chrome/browser/gtk/first_run_bubble.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/gtk_util.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" @@ -14,6 +13,7 @@ #include "chrome/browser/options_window.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/gtk/fullscreen_exit_bubble_gtk.cc index 4594fa4..fb93241 100644 --- a/chrome/browser/gtk/fullscreen_exit_bubble_gtk.cc +++ b/chrome/browser/gtk/fullscreen_exit_bubble_gtk.cc @@ -4,12 +4,12 @@ #include "chrome/browser/gtk/fullscreen_exit_bubble_gtk.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" #include "chrome/browser/gtk/gtk_floating_container.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/rounded_window.h" +#include "gfx/gtk_util.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc index 0be3f18..f2b94e4 100644 --- a/chrome/browser/gtk/gtk_chrome_button.cc +++ b/chrome/browser/gtk/gtk_chrome_button.cc @@ -4,10 +4,9 @@ #include "chrome/browser/gtk/gtk_chrome_button.h" -#include "app/gfx/gtk_util.h" #include "base/basictypes.h" #include "chrome/browser/gtk/nine_box.h" - +#include "gfx/gtk_util.h" #include "grit/app_resources.h" namespace { diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc index db9de14..69a4569 100644 --- a/chrome/browser/gtk/gtk_theme_provider.cc +++ b/chrome/browser/gtk/gtk_theme_provider.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/gfx/color_utils.h" -#include "app/gfx/gtk_util.h" #include "app/gfx/skbitmap_operations.h" #include "app/gfx/skia_utils_gtk.h" #include "app/resource_bundle.h" @@ -27,6 +26,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" +#include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/gtk_tree.cc b/chrome/browser/gtk/gtk_tree.cc index 328ee02..6eb08b0 100644 --- a/chrome/browser/gtk/gtk_tree.cc +++ b/chrome/browser/gtk/gtk_tree.cc @@ -4,11 +4,11 @@ #include "chrome/browser/gtk/gtk_tree.h" -#include "app/gfx/gtk_util.h" #include "app/table_model.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_theme_provider.h" +#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" namespace gtk_tree { diff --git a/chrome/browser/gtk/html_dialog_gtk.h b/chrome/browser/gtk/html_dialog_gtk.h index 2bda618..d292ffb 100644 --- a/chrome/browser/gtk/html_dialog_gtk.h +++ b/chrome/browser/gtk/html_dialog_gtk.h @@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #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" typedef struct _GtkWidget GtkWidget; diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc index a0480cf..ded88d6 100644 --- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/process_util.h" @@ -17,6 +16,7 @@ #include "chrome/browser/tab_contents/tab_contents.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" diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc index edd5a79..9da396a 100644 --- a/chrome/browser/gtk/info_bubble_gtk.cc +++ b/chrome/browser/gtk/info_bubble_gtk.cc @@ -7,14 +7,14 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" +#include "gfx/path.h" #include "gfx/rect.h" namespace { diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc index 60d618c..3b96319 100644 --- a/chrome/browser/gtk/infobar_gtk.cc +++ b/chrome/browser/gtk/infobar_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" @@ -15,6 +14,7 @@ #include "chrome/browser/gtk/infobar_container_gtk.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" namespace { diff --git a/chrome/browser/gtk/keyword_editor_view.cc b/chrome/browser/gtk/keyword_editor_view.cc index aeef8d6..e4bc1a5 100644 --- a/chrome/browser/gtk/keyword_editor_view.cc +++ b/chrome/browser/gtk/keyword_editor_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_table_model.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/list_store_favicon_loader.cc b/chrome/browser/gtk/list_store_favicon_loader.cc index f9a4236..4623dcf 100644 --- a/chrome/browser/gtk/list_store_favicon_loader.cc +++ b/chrome/browser/gtk/list_store_favicon_loader.cc @@ -7,10 +7,10 @@ #include <vector> #include "app/gfx/codec/png_codec.h" -#include "app/gfx/gtk_util.h" #include "base/callback.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/profile.h" +#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" ListStoreFavIconLoader::ListStoreFavIconLoader( diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 9e2cb0a..1d8c786 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/gfx/canvas_paint.h" -#include "app/gfx/gtk_util.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/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index fdf6241..67d7208 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -6,7 +6,6 @@ #include <map> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" #include "app/menus/menu_model.h" @@ -16,6 +15,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/standard_menus.h" +#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" using gtk_util::ConvertAcceleratorsFromWindowsStyle; diff --git a/chrome/browser/gtk/nine_box.cc b/chrome/browser/gtk/nine_box.cc index 261856a..a0f8f40 100644 --- a/chrome/browser/gtk/nine_box.cc +++ b/chrome/browser/gtk/nine_box.cc @@ -4,12 +4,12 @@ #include "chrome/browser/gtk/nine_box.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "base/basictypes.h" #include "base/logging.h" +#include "gfx/gtk_util.h" #include "gfx/point.h" namespace { diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index e022b5e..1e8001f 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -8,8 +8,6 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/insets.h" -#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -38,6 +36,8 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/insets.h" +#include "gfx/native_widget_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h index 43a0e7d..de71a41 100644 --- a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h +++ b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_HOST_GTK_H_ #define CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_HOST_GTK_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/browser/gtk/extension_view_gtk.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/notification.h" @@ -13,6 +12,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" +#include "gfx/native_widget_types.h" #include "webkit/glue/webpreferences.h" class Profile; diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc index 31c01de..7cf9630 100644 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc @@ -6,12 +6,12 @@ #include <set> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/content_exception_editor.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index f911c44..356146e 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/gfx/gtk_util.h" #include "app/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -25,6 +24,7 @@ #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" diff --git a/chrome/browser/gtk/options/cookies_view.cc b/chrome/browser/gtk/options/cookies_view.cc index bf34b70..3434b6b 100644 --- a/chrome/browser/gtk/options/cookies_view.cc +++ b/chrome/browser/gtk/options/cookies_view.cc @@ -8,12 +8,12 @@ #include <set> #include <string> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/gtk/gtk_util.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc index 47a203c..5488e4f 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" @@ -15,6 +14,7 @@ #include "chrome/browser/pref_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" diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc index a4e06de..0de0403 100644 --- a/chrome/browser/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/gfx/gtk_util.h" #include "app/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -16,6 +15,7 @@ #include "chrome/browser/pref_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" diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index d1b708a..df45b14 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -4,7 +4,6 @@ #include <gtk/gtk.h> -#include "app/gfx/gtk_util.h" #include "app/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" @@ -18,6 +17,7 @@ #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.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" diff --git a/chrome/browser/gtk/sad_tab_gtk.cc b/chrome/browser/gtk/sad_tab_gtk.cc index 88f409b..f3ec1a4 100644 --- a/chrome/browser/gtk/sad_tab_gtk.cc +++ b/chrome/browser/gtk/sad_tab_gtk.cc @@ -6,11 +6,11 @@ #include <string> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/status_bubble_gtk.cc b/chrome/browser/gtk/status_bubble_gtk.cc index ba25657..df22b37 100644 --- a/chrome/browser/gtk/status_bubble_gtk.cc +++ b/chrome/browser/gtk/status_bubble_gtk.cc @@ -8,7 +8,6 @@ #include <algorithm> -#include "app/gfx/gtk_util.h" #include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "base/message_loop.h" @@ -18,6 +17,7 @@ #include "chrome/browser/gtk/rounded_window.h" #include "chrome/browser/gtk/slide_animator_gtk.h" #include "chrome/common/notification_service.h" +#include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/gtk/tab_contents_container_gtk.cc b/chrome/browser/gtk/tab_contents_container_gtk.cc index fcf6a3d..3760f86 100644 --- a/chrome/browser/gtk/tab_contents_container_gtk.cc +++ b/chrome/browser/gtk/tab_contents_container_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/tab_contents_container_gtk.h" -#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "chrome/browser/gtk/gtk_expanded_container.h" #include "chrome/browser/gtk/gtk_floating_container.h" @@ -12,6 +11,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/common/notification_service.h" +#include "gfx/native_widget_types.h" TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble) : tab_contents_(NULL), diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index 35693e9..7740ee6 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -7,12 +7,12 @@ #include <gtk/gtk.h> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/gfx/point.h" #include "base/message_loop.h" #include "base/string16.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc index bc2cd81..25a32048 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc @@ -9,7 +9,6 @@ #include <algorithm> #include "app/gfx/canvas_paint.h" -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" @@ -20,6 +19,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/x11_util.h" +#include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index 165b789..130b17a 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -7,7 +7,6 @@ #include <gdk/gdkkeysyms.h> #include "app/gtk_dnd_util.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" #include "app/resource_bundle.h" @@ -19,6 +18,7 @@ #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/gtk/standard_menus.h" #include "chrome/browser/tab_menu_model.h" +#include "gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 48134f9..11e4521 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/gfx/canvas_paint.h" -#include "app/gfx/gtk_util.h" #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -24,6 +23,7 @@ #include "chrome/browser/tab_contents/tab_contents.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" diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc index a63140b8..96a6229 100644 --- a/chrome/browser/gtk/task_manager_gtk.cc +++ b/chrome/browser/gtk/task_manager_gtk.cc @@ -11,7 +11,6 @@ #include <utility> #include <vector> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" @@ -29,6 +28,7 @@ #include "chrome/browser/pref_service.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" diff --git a/chrome/browser/gtk/theme_install_bubble_view_gtk.cc b/chrome/browser/gtk/theme_install_bubble_view_gtk.cc index 3d9befb..651ab29 100644 --- a/chrome/browser/gtk/theme_install_bubble_view_gtk.cc +++ b/chrome/browser/gtk/theme_install_bubble_view_gtk.cc @@ -6,12 +6,12 @@ #include <math.h> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/rounded_window.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "gfx/gtk_util.h" #include "grit/generated_resources.h" // Roundedness of bubble. diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index cb70cfa..2834c89 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -10,7 +10,6 @@ #include "build/build_config.h" -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" @@ -18,6 +17,7 @@ #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/importer/importer_list.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" class ImporterBridge; diff --git a/chrome/browser/input_window_dialog.h b/chrome/browser/input_window_dialog.h index 182f7fb..0a29cda 100644 --- a/chrome/browser/input_window_dialog.h +++ b/chrome/browser/input_window_dialog.h @@ -7,8 +7,8 @@ #include <string> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" +#include "gfx/native_widget_types.h" // Cross platform access to a modal input window. class InputWindowDialog { diff --git a/chrome/browser/jsmessage_box_client.h b/chrome/browser/jsmessage_box_client.h index 169805c..86ee442 100644 --- a/chrome/browser/jsmessage_box_client.h +++ b/chrome/browser/jsmessage_box_client.h @@ -13,7 +13,7 @@ #include <string> -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" class ExtensionHost; class GURL; diff --git a/chrome/browser/page_info_window.h b/chrome/browser/page_info_window.h index bdbee94..668a6e9 100644 --- a/chrome/browser/page_info_window.h +++ b/chrome/browser/page_info_window.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PAGE_INFO_WINDOW_H_ #define CHROME_BROWSER_PAGE_INFO_WINDOW_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "gfx/native_widget_types.h" class Profile; class GURL; diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 7772eb3..2ba0c1c 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -13,7 +13,6 @@ #include <vector> #include "app/app_switches.h" -#include "app/gfx/native_widget_types.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" @@ -34,6 +33,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" +#include "gfx/native_widget_types.h" #include "ipc/ipc_switches.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" @@ -46,7 +46,7 @@ #endif #if defined(USE_X11) -#include "app/gfx/gtk_native_view_id_manager.h" +#include "gfx/gtk_native_view_id_manager.h" #endif #if defined(OS_MACOSX) diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index 079ca85..4c40cbc 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -12,13 +12,13 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/child_process_host.h" #include "chrome/browser/net/resolve_proxy_msg_helper.h" #include "chrome/browser/renderer_host/resource_message_filter.h" +#include "gfx/native_widget_types.h" #include "ipc/ipc_channel_handle.h" #include "webkit/glue/webplugininfo.h" diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index eec13db..e21f865 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_H_ #define CHROME_BROWSER_PRINTING_PRINT_JOB_H_ -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/printing/print_job_worker_owner.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" class GURL; class Thread; diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index 8eb15dd..8562ea9 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_JOB_WORKER_H__ #define CHROME_BROWSER_PRINTING_PRINT_JOB_WORKER_H__ -#include "app/gfx/native_widget_types.h" #include "base/task.h" #include "base/thread.h" +#include "gfx/native_widget_types.h" #include "printing/page_number.h" #include "printing/printing_context.h" diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index 847611c..8810022 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_PRINTING_PRINTER_QUERY_H_ #define CHROME_BROWSER_PRINTING_PRINTER_QUERY_H_ -#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/browser/printing/print_job_worker_owner.h" +#include "gfx/native_widget_types.h" class CancelableTask; class MessageLoop; diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index d182f45..d7fd0f5 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -11,12 +11,12 @@ #include <windows.h> #endif -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/ref_counted.h" +#include "gfx/native_widget_types.h" class CommandLine; diff --git a/chrome/browser/renderer_host/accelerated_surface_container_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_mac.h index c3095a1..393487f 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_mac.h +++ b/chrome/browser/renderer_host/accelerated_surface_container_mac.h @@ -28,10 +28,10 @@ #include <CoreFoundation/CoreFoundation.h> #include <OpenGL/OpenGL.h> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/common/transport_dib.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" namespace webkit_glue { diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h index 95bf054..8bc44b5 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h +++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h @@ -9,9 +9,9 @@ #include <map> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "chrome/common/transport_dib.h" +#include "gfx/native_widget_types.h" namespace webkit_glue { struct WebPluginGeometry; diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 6d62fb2..1c76a24 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -8,7 +8,6 @@ #include <utility> #include <vector> -#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/json/json_reader.h" @@ -39,6 +38,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" +#include "gfx/native_widget_types.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index e20c241..3309fbb 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -7,18 +7,18 @@ #include <deque> -#include "app/gfx/native_widget_types.h" #include "base/process.h" #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/timer.h" -#include "ipc/ipc_channel_handle.h" #include "chrome/common/edit_command.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/property_bag.h" #include "chrome/common/transport_dib.h" +#include "gfx/native_widget_types.h" #include "gfx/size.h" #include "ipc/ipc_channel.h" +#include "ipc/ipc_channel_handle.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h index b98351a..a022ec8 100644 --- a/chrome/browser/renderer_host/render_widget_host_view.h +++ b/chrome/browser/renderer_host/render_widget_host_view.h @@ -9,9 +9,9 @@ #include <OpenGL/OpenGL.h> #endif -#include "app/gfx/native_widget_types.h" #include "base/shared_memory.h" #include "chrome/common/transport_dib.h" +#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index 9d93af2..0c10ef3 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -18,7 +18,6 @@ #include <algorithm> #include <string> -#include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" @@ -36,6 +35,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/x11_util.h" +#include "gfx/gtk_util.h" #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "webkit/glue/webcursor_gtk_data.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h index 0b05d0b..cd38590 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h @@ -11,11 +11,11 @@ #include <vector> #include <string> -#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "base/time.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/common/owned_widget_gtk.h" +#include "gfx/native_widget_types.h" #include "webkit/glue/plugins/gtk_plugin_container_manager.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index f25be7c..74ae523 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -5,7 +5,6 @@ #include "chrome/browser/renderer_host/resource_message_filter.h" #include "app/clipboard/clipboard.h" -#include "app/gfx/native_widget_types.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_util.h" @@ -56,6 +55,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "chrome/common/worker_messages.h" +#include "gfx/native_widget_types.h" #include "net/base/cookie_monster.h" #include "net/base/keygen_handler.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 6438bd5..419a1ab 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -13,7 +13,6 @@ #include <vector> #include "app/clipboard/clipboard.h" -#include "app/gfx/native_widget_types.h" #include "base/callback.h" #include "base/file_path.h" #include "base/process.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/render_messages.h" #include "chrome/common/transport_dib.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "ipc/ipc_channel_proxy.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index 6c44d81..93b5f47 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -8,7 +8,6 @@ #include <map> #include "app/clipboard/clipboard.h" -#include "app/gfx/gtk_native_view_id_manager.h" #include "app/l10n_util.h" #include "base/file_util.h" #include "base/path_service.h" @@ -20,6 +19,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/render_messages.h" #include "chrome/common/x11_util.h" +#include "gfx/gtk_native_view_id_manager.h" #include "grit/generated_resources.h" #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" diff --git a/chrome/browser/search_engines/edit_search_engine_controller.h b/chrome/browser/search_engines/edit_search_engine_controller.h index 1031fbd..becde82 100644 --- a/chrome/browser/search_engines/edit_search_engine_controller.h +++ b/chrome/browser/search_engines/edit_search_engine_controller.h @@ -7,7 +7,7 @@ #include <string> -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" class Profile; class TemplateURL; diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h index 911ceeb..485a808 100644 --- a/chrome/browser/search_engines/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_ #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_ -#include "app/gfx/native_widget_types.h" #include "base/scoped_vector.h" +#include "gfx/native_widget_types.h" class GURL; class Profile; diff --git a/chrome/browser/shell_dialogs.h b/chrome/browser/shell_dialogs.h index 61a89fc..18400f6 100644 --- a/chrome/browser/shell_dialogs.h +++ b/chrome/browser/shell_dialogs.h @@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/file_path.h" #include "base/ref_counted.h" #include "base/string16.h" +#include "gfx/native_widget_types.h" namespace gfx { class Font; diff --git a/chrome/browser/ssl/ssl_client_auth_handler_gtk.cc b/chrome/browser/ssl/ssl_client_auth_handler_gtk.cc index 6be5a83..72f332a 100644 --- a/chrome/browser/ssl/ssl_client_auth_handler_gtk.cc +++ b/chrome/browser/ssl/ssl_client_auth_handler_gtk.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" @@ -21,6 +20,7 @@ #include "chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h" #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h" #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h" +#include "gfx/native_widget_types.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 17b0b0b..3a63ec8 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -13,7 +13,6 @@ #include <string> #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" @@ -41,6 +40,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/property_bag.h" #include "chrome/common/renderer_preferences.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "net/base/load_states.h" #include "webkit/glue/dom_operations.h" diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h index 9ac445a..53acce0 100644 --- a/chrome/browser/tab_contents/tab_contents_delegate.h +++ b/chrome/browser/tab_contents/tab_contents_delegate.h @@ -7,12 +7,12 @@ #include <string> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/page_transition_types.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "webkit/glue/context_menu.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h index ad0b6c4..9d2c712 100644 --- a/chrome/browser/tab_contents/tab_contents_view.h +++ b/chrome/browser/tab_contents/tab_contents_view.h @@ -8,10 +8,10 @@ #include <map> #include <string> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/tab_contents/web_drag_source_win.h b/chrome/browser/tab_contents/web_drag_source_win.h index 617970e..c851142 100644 --- a/chrome/browser/tab_contents/web_drag_source_win.h +++ b/chrome/browser/tab_contents/web_drag_source_win.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_ #define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_ -#include "app/gfx/native_widget_types.h" #include "base/base_drag_source.h" #include "base/basictypes.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" #include "gfx/point.h" class RenderViewHost; diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index ef89905..c6eeff0 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -7,8 +7,6 @@ #include "app/bidi_line_iterator.h" #include "app/gfx/canvas.h" #include "app/gfx/color_utils.h" -#include "app/gfx/insets.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -17,6 +15,8 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/bubble_positioner.h" #include "chrome/browser/views/bubble_border.h" +#include "gfx/insets.h" +#include "gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc index 7f3f0c6..b0bf07b 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_gtk.h" -#include "app/gfx/insets.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "gfx/insets.h" //////////////////////////////////////////////////////////////////////////////// // AutocompletePopupGtk, public: diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc index df8d9dd..35231fe 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" -#include "app/gfx/insets.h" #include "app/win_util.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" +#include "gfx/insets.h" //////////////////////////////////////////////////////////////////////////////// // AutocompletePopupWin, public: diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.h b/chrome/browser/views/bookmark_context_menu_controller_views.h index 441b666..46a8ecc 100644 --- a/chrome/browser/views/bookmark_context_menu_controller_views.h +++ b/chrome/browser/views/bookmark_context_menu_controller_views.h @@ -7,9 +7,9 @@ #include <vector> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" +#include "gfx/native_widget_types.h" class Browser; class PageNavigator; diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h index 693c83c..150e6b0 100644 --- a/chrome/browser/views/bookmark_menu_controller_views.h +++ b/chrome/browser/views/bookmark_menu_controller_views.h @@ -8,10 +8,10 @@ #include <map> #include <set> -#include "app/gfx/native_widget_types.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/views/bookmark_context_menu.h" +#include "gfx/native_widget_types.h" #include "views/controls/menu/menu_delegate.h" #include "views/controls/menu/menu_item_view.h" diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h index ff54963..6997a0a 100644 --- a/chrome/browser/views/browser_dialogs.h +++ b/chrome/browser/views/browser_dialogs.h @@ -7,8 +7,8 @@ #include <string> -#include "app/gfx/native_widget_types.h" #include "chrome/common/content_settings_types.h" +#include "gfx/native_widget_types.h" // This file contains functions for running a variety of browser dialogs and // popups. The dialogs here are the ones that the caller does not need to diff --git a/chrome/browser/views/bubble_border.cc b/chrome/browser/views/bubble_border.cc index fd964be..01f9250 100644 --- a/chrome/browser/views/bubble_border.cc +++ b/chrome/browser/views/bubble_border.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/bubble_border.h" #include "app/gfx/canvas.h" -#include "app/gfx/path.h" #include "app/resource_bundle.h" #include "base/logging.h" +#include "gfx/path.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index 0535447..d30ce35 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -5,13 +5,13 @@ #include "chrome/browser/views/clear_browsing_data.h" #include "app/l10n_util.h" -#include "app/gfx/insets.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/pref_names.h" +#include "gfx/insets.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/views/confirm_message_box_dialog.h b/chrome/browser/views/confirm_message_box_dialog.h index 81c0213..3c303b7 100644 --- a/chrome/browser/views/confirm_message_box_dialog.h +++ b/chrome/browser/views/confirm_message_box_dialog.h @@ -7,8 +7,8 @@ #include <string> -#include "app/gfx/native_widget_types.h" #include "base/basictypes.h" +#include "gfx/native_widget_types.h" #include "views/controls/label.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index 8918489..9f48f4b 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -6,7 +6,6 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/path.h" #include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -23,6 +22,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "gfx/path.h" #include "gfx/rect.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/dropdown_bar_host.cc b/chrome/browser/views/dropdown_bar_host.cc index 768c0a7..539d6cc 100644 --- a/chrome/browser/views/dropdown_bar_host.cc +++ b/chrome/browser/views/dropdown_bar_host.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/dropdown_bar_host.h" -#include "app/gfx/path.h" -#include "app/gfx/scrollbar_size.h" #include "app/slide_animation.h" #include "base/keyboard_codes.h" #include "base/scoped_handle.h" @@ -16,6 +14,8 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "gfx/path.h" +#include "gfx/scrollbar_size.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" #include "views/widget/widget.h" diff --git a/chrome/browser/views/dropdown_bar_host.h b/chrome/browser/views/dropdown_bar_host.h index 4d3d794..2528e7f 100644 --- a/chrome/browser/views/dropdown_bar_host.h +++ b/chrome/browser/views/dropdown_bar_host.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_ #include "app/animation.h" -#include "app/gfx/native_widget_types.h" #include "base/scoped_ptr.h" #include "chrome/common/native_web_keyboard_event.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "views/controls/textfield/textfield.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/views/extensions/extension_popup.h b/chrome/browser/views/extensions/extension_popup.h index 72df7b2..6969fc2 100644 --- a/chrome/browser/views/extensions/extension_popup.h +++ b/chrome/browser/views/extensions/extension_popup.h @@ -5,13 +5,13 @@ #ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ #define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/views/browser_bubble.h" #include "chrome/browser/views/extensions/extension_view.h" #include "chrome/browser/views/bubble_border.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" class Browser; diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h index 02f5941..cf15fba 100644 --- a/chrome/browser/views/find_bar_host.h +++ b/chrome/browser/views/find_bar_host.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_ #include "app/animation.h" -#include "app/gfx/native_widget_types.h" #include "chrome/browser/find_bar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/views/dropdown_bar_host.h" +#include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "views/controls/textfield/textfield.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 e588001..c3c5c98 100644 --- a/chrome/browser/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/views/frame/app_panel_browser_frame_view.cc @@ -6,13 +6,13 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/path.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/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 3a05746..7a6c20b 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -10,7 +10,6 @@ #include "app/drag_drop_types.h" #include "app/gfx/canvas.h" -#include "app/gfx/scrollbar_size.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/scrollbar_size.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index e811334..bf753e9 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -9,7 +9,6 @@ #include <set> #include <string> -#include "app/gfx/native_widget_types.h" #include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "base/timer.h" @@ -23,6 +22,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/tabs/base_tab_strip.h" #include "chrome/browser/views/unhandled_keyboard_event_handler.h" +#include "gfx/native_widget_types.h" #include "views/window/client_view.h" #include "views/window/window_delegate.h" diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc index 892dbac..2c11574 100644 --- a/chrome/browser/views/frame/browser_view_layout.cc +++ b/chrome/browser/views/frame/browser_view_layout.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/frame/browser_view_layout.h" -#include "app/gfx/scrollbar_size.h" #include "chrome/browser/find_bar.h" #include "chrome/browser/find_bar_controller.h" #include "chrome/browser/view_ids.h" @@ -17,6 +16,7 @@ #include "chrome/browser/views/tabs/side_tab_strip.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/toolbar_view.h" +#include "gfx/scrollbar_size.h" #include "views/window/window.h" #if defined(OS_LINUX) diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 35c9e91..99fe001 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -6,7 +6,6 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -17,6 +16,7 @@ #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/path.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 3a8be7d..6191f5d 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -6,11 +6,11 @@ #include "app/gfx/canvas.h" #include "app/gfx/color_utils.h" -#include "app/gfx/path.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/path.h" #include "third_party/skia/include/core/SkPaint.h" #include "views/fill_layout.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc index f8c31a2..b9a765b 100644 --- a/chrome/browser/views/notifications/balloon_view.cc +++ b/chrome/browser/views/notifications/balloon_view.cc @@ -7,8 +7,6 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/insets.h" -#include "app/gfx/native_widget_types.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" @@ -24,6 +22,8 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "gfx/insets.h" +#include "gfx/native_widget_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/views/notifications/balloon_view.h b/chrome/browser/views/notifications/balloon_view.h index e6853e0..a92aae3 100644 --- a/chrome/browser/views/notifications/balloon_view.h +++ b/chrome/browser/views/notifications/balloon_view.h @@ -7,7 +7,6 @@ #ifndef CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_ #define CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_ -#include "app/gfx/path.h" #include "app/menus/simple_menu_model.h" #include "app/slide_animation.h" #include "base/basictypes.h" @@ -16,6 +15,7 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" +#include "gfx/path.h" #include "gfx/point.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h index 5f06b5d..885ce54 100644 --- a/chrome/browser/views/repost_form_warning_view.h +++ b/chrome/browser/views/repost_form_warning_view.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ #define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_ -#include "app/gfx/native_widget_types.h" #include "chrome/common/notification_registrar.h" +#include "gfx/native_widget_types.h" #include "views/window/dialog_delegate.h" class MessageBoxView; diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h index 0aa930a..804983c 100644 --- a/chrome/browser/views/tabs/native_view_photobooth.h +++ b/chrome/browser/views/tabs/native_view_photobooth.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ #define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_ -#include "app/gfx/native_widget_types.h" +#include "gfx/native_widget_types.h" namespace gfx { class Canvas; diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc index efa3d8d..ac41c8a 100644 --- a/chrome/browser/views/tabs/side_tab.cc +++ b/chrome/browser/views/tabs/side_tab.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/tabs/side_tab.h" #include "app/gfx/canvas.h" -#include "app/gfx/path.h" #include "app/gfx/skia_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "base/utf_string_conversions.h" +#include "gfx/path.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index bb822b8..4c6aa46 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -6,7 +6,6 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" @@ -14,6 +13,7 @@ #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/path.h" #include "gfx/size.h" #include "grit/generated_resources.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index a8fd5f7..ec15794 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -6,7 +6,6 @@ #include "app/drag_drop_types.h" #include "app/gfx/canvas.h" -#include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/os_exchange_data.h" #include "app/resource_bundle.h" @@ -23,6 +22,7 @@ #include "chrome/browser/views/tabs/dragged_tab_controller.h" #include "chrome/browser/views/tabs/tab.h" #include "chrome/common/pref_names.h" +#include "gfx/path.h" #include "gfx/size.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" |