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