diff options
204 files changed, 234 insertions, 234 deletions
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc index cd0e52b..5573c32 100644 --- a/cc/trees/property_tree_builder.cc +++ b/cc/trees/property_tree_builder.cc @@ -10,7 +10,7 @@ #include "cc/base/math_util.h" #include "cc/layers/layer.h" #include "cc/trees/layer_tree_host.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/point_f.h" namespace cc { diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc index d0b8b3a..a71342d 100644 --- a/chrome/browser/chromeos/display/display_preferences.cc +++ b/chrome/browser/chromeos/display/display_preferences.cc @@ -21,7 +21,7 @@ #include "components/user_manager/user_manager.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/gfx/display.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" #include "url/url_canon.h" #include "url/url_util.h" diff --git a/chrome/browser/chromeos/display/overscan_calibrator.h b/chrome/browser/chromeos/display/overscan_calibrator.h index 7def2d0..2ce6e7f 100644 --- a/chrome/browser/chromeos/display/overscan_calibrator.h +++ b/chrome/browser/chromeos/display/overscan_calibrator.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/compositor/layer_delegate.h" #include "ui/gfx/display.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index 8c7adbb..a8a1680 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc @@ -34,8 +34,8 @@ #include "components/user_manager/user_manager.h" #include "content/public/test/test_utils.h" #include "ui/aura/env.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" using wallpaper::WallpaperLayout; diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc index f3fb10b..0ac8454 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc @@ -16,7 +16,7 @@ #include "chromeos/chromeos_switches.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/jpeg_codec.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" namespace chromeos { diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring.h b/chrome/browser/chromeos/ui/accessibility_focus_ring.h index 04a3be0..2f5c09f 100644 --- a/chrome/browser/chromeos/ui/accessibility_focus_ring.h +++ b/chrome/browser/chromeos/ui/accessibility_focus_ring.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_H_ #define CHROME_BROWSER_CHROMEOS_UI_ACCESSIBILITY_FOCUS_RING_H_ -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" namespace chromeos { diff --git a/chrome/browser/devtools/devtools_contents_resizing_strategy.h b/chrome/browser/devtools/devtools_contents_resizing_strategy.h index e6a3c9b..ffbd36f1 100644 --- a/chrome/browser/devtools/devtools_contents_resizing_strategy.h +++ b/chrome/browser/devtools/devtools_contents_resizing_strategy.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_ #include "base/basictypes.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h index 17a50db..91cfffb 100644 --- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h +++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/download/drag_download_item_views.cc b/chrome/browser/download/drag_download_item_views.cc index 9584e8e..b32cfc3 100644 --- a/chrome/browser/download/drag_download_item_views.cc +++ b/chrome/browser/download/drag_download_item_views.cc @@ -16,9 +16,9 @@ #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/file_info.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/point.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" #include "ui/wm/public/drag_drop_client.h" diff --git a/chrome/browser/extensions/display_info_provider_chromeos.cc b/chrome/browser/extensions/display_info_provider_chromeos.cc index 4cf8c6de..53b5ab8 100644 --- a/chrome/browser/extensions/display_info_provider_chromeos.cc +++ b/chrome/browser/extensions/display_info_provider_chromeos.cc @@ -11,7 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "extensions/common/api/system_display.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" using ash::DisplayManager; diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h index d8f1e78..8bdbbd1 100644 --- a/chrome/browser/extensions/extension_icon_manager.h +++ b/chrome/browser/extensions/extension_icon_manager.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" namespace content { class BrowserContext; diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index e0d1fc9..c6ed15b9 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -97,7 +97,7 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/favicon_size.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc index a941dd5..bfbe8d3 100644 --- a/chrome/browser/ui/android/context_menu_helper.cc +++ b/chrome/browser/ui/android/context_menu_helper.cc @@ -11,7 +11,7 @@ #include "content/public/common/context_menu_params.h" #include "jni/ContextMenuHelper_jni.h" #include "jni/ContextMenuParams_jni.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" using base::android::ConvertUTF8ToJavaString; using base::android::ConvertUTF16ToJavaString; diff --git a/chrome/browser/ui/app_list/app_list_positioner.cc b/chrome/browser/ui/app_list/app_list_positioner.cc index 6593977..09fe64a 100644 --- a/chrome/browser/ui/app_list/app_list_positioner.cc +++ b/chrome/browser/ui/app_list/app_list_positioner.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" AppListPositioner::AppListPositioner(const gfx::Display& display, diff --git a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm index 2963db8..a93545d 100644 --- a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm +++ b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm @@ -6,7 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index af09a0c..5cb7812 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -193,7 +193,7 @@ #include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/window_open_disposition.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/shell_dialogs/selected_file_info.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm index 656bba2..caab695 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm @@ -14,8 +14,8 @@ #include "ui/base/cocoa/window_size_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" using autofill::AutofillPopupView; diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm index 0b1b257b..5566c98 100644 --- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm @@ -20,8 +20,8 @@ #import "ui/base/cocoa/controls/hyperlink_text_view.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point.h" #include "ui/gfx/range/range.h" #include "ui/gfx/rect.h" #include "ui/gfx/text_constants.h" diff --git a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm index 81bf185..9c2ec09 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm @@ -10,8 +10,8 @@ #include "chrome/browser/ui/confirm_bubble.h" #include "chrome/browser/ui/confirm_bubble_model.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point.h" // The width for the message text. We break lines so the specified message fits // into this width. diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller.mm index 014a5ea..95c4a73 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller.mm @@ -8,8 +8,8 @@ #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/confirm_bubble_cocoa.h" #import "chrome/browser/ui/confirm_bubble_model.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point.h" @implementation ConfirmBubbleController diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm index 604457dc..891c951 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm @@ -12,7 +12,7 @@ #include "grit/theme_resources.h" #import "testing/gtest_mac.h" #include "ui/base/resource/resource_bundle.h" -#import "ui/gfx/point.h" +#import "ui/gfx/geometry/point.h" namespace { diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h index eb69a24..897c4a8 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h @@ -6,7 +6,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/strings/string16.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" class Browser; class FindBarBridge; diff --git a/chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h index aefd565..38e6cff 100644 --- a/chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h +++ b/chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_PANELS_PANEL_UTILS_COCOA_H_ #import <Cocoa/Cocoa.h> -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" namespace cocoa_utils { diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index 6fcbc2f..667d952 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -23,7 +23,7 @@ #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/gfx/font_list.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/text_elider.h" #include "ui/gfx/text_utils.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm index c5b1784..2a1a3ec 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm @@ -15,7 +15,7 @@ #import "testing/gtest_mac.h" #include "testing/platform_test.h" #import "third_party/ocmock/OCMock/OCMock.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "url/gurl.h" using base::UTF8ToUTF16; diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h index 6386327..41f5c28 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h @@ -8,7 +8,7 @@ #include "base/timer/timer.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "ui/gfx/animation/animation_delegate.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "url/gurl.h" class Browser; diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 1f26cf6..9ab2c67 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -47,7 +47,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" using base::ASCIIToUTF16; using base::UTF16ToUTF8; diff --git a/chrome/browser/ui/panels/detached_panel_collection.h b/chrome/browser/ui/panels/detached_panel_collection.h index 49265ba..a2e1aec 100644 --- a/chrome/browser/ui/panels/detached_panel_collection.h +++ b/chrome/browser/ui/panels/detached_panel_collection.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_collection.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" class PanelManager; diff --git a/chrome/browser/ui/panels/detached_panel_drag_handler.cc b/chrome/browser/ui/panels/detached_panel_drag_handler.cc index 407f811..232e581 100644 --- a/chrome/browser/ui/panels/detached_panel_drag_handler.cc +++ b/chrome/browser/ui/panels/detached_panel_drag_handler.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_collection.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" // static diff --git a/chrome/browser/ui/panels/docked_panel_drag_handler.cc b/chrome/browser/ui/panels/docked_panel_drag_handler.cc index 8d4384e..6572bdc 100644 --- a/chrome/browser/ui/panels/docked_panel_drag_handler.cc +++ b/chrome/browser/ui/panels/docked_panel_drag_handler.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/panels/docked_panel_collection.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" // static diff --git a/chrome/browser/ui/panels/panel_collection.h b/chrome/browser/ui/panels/panel_collection.h index dc53348..55d53f7 100644 --- a/chrome/browser/ui/panels/panel_collection.h +++ b/chrome/browser/ui/panels/panel_collection.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_PANELS_PANEL_COLLECTION_H_ #include "chrome/browser/ui/panels/panel_constants.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" class Panel; diff --git a/chrome/browser/ui/panels/panel_mouse_watcher.cc b/chrome/browser/ui/panels/panel_mouse_watcher.cc index 1774658..a96b4cc 100644 --- a/chrome/browser/ui/panels/panel_mouse_watcher.cc +++ b/chrome/browser/ui/panels/panel_mouse_watcher.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/panels/panel_mouse_watcher.h" #include "chrome/browser/ui/panels/panel_mouse_watcher_observer.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" PanelMouseWatcher::PanelMouseWatcher() { } diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc index 4dc3d42..a1414ab 100644 --- a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc +++ b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/panels/panel_mouse_watcher.h" #include "chrome/browser/ui/panels/panel_mouse_watcher_observer.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" class TestMouseObserver : public PanelMouseWatcherObserver { public: diff --git a/chrome/browser/ui/panels/panel_resize_controller.h b/chrome/browser/ui/panels/panel_resize_controller.h index e2cb338..f85b7d2 100644 --- a/chrome/browser/ui/panels/panel_resize_controller.h +++ b/chrome/browser/ui/panels/panel_resize_controller.h @@ -8,7 +8,7 @@ #include <set> #include "base/basictypes.h" #include "chrome/browser/ui/panels/panel_constants.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" class Panel; diff --git a/chrome/browser/ui/panels/stacked_panel_drag_handler.cc b/chrome/browser/ui/panels/stacked_panel_drag_handler.cc index e09b65a..7f3a684 100644 --- a/chrome/browser/ui/panels/stacked_panel_drag_handler.cc +++ b/chrome/browser/ui/panels/stacked_panel_drag_handler.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_collection.h" #include "chrome/browser/ui/panels/stacked_panel_collection.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" // static diff --git a/chrome/browser/ui/panels/test_panel_mouse_watcher.h b/chrome/browser/ui/panels/test_panel_mouse_watcher.h index 146a5b2..868109d 100644 --- a/chrome/browser/ui/panels/test_panel_mouse_watcher.h +++ b/chrome/browser/ui/panels/test_panel_mouse_watcher.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/panels/panel_mouse_watcher.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" // Test mouse watcher for simulating mouse movements in tests. class TestPanelMouseWatcher : public PanelMouseWatcher { diff --git a/chrome/browser/ui/tabs/dock_info.h b/chrome/browser/ui/tabs/dock_info.h index e93975c..acf2afd 100644 --- a/chrome/browser/ui/tabs/dock_info.h +++ b/chrome/browser/ui/tabs/dock_info.h @@ -8,8 +8,8 @@ #include <set> #include "chrome/browser/ui/host_desktop.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" // DockInfo is used to do determine possible dock locations for a dragged diff --git a/chrome/browser/ui/views/app_list/linux/app_list_linux_unittest.cc b/chrome/browser/ui/views/app_list/linux/app_list_linux_unittest.cc index 1eed99c..208f5ea 100644 --- a/chrome/browser/ui/views/app_list/linux/app_list_linux_unittest.cc +++ b/chrome/browser/ui/views/app_list/linux/app_list_linux_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/app_list/app_list_positioner.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc b/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc index 28b11f0..d1357055 100644 --- a/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc +++ b/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/app_list/app_list_positioner.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc index 0e0985c..8949a3b 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc @@ -35,8 +35,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/path.h" -#include "ui/gfx/point.h" #include "ui/gfx/skia_util.h" #include "ui/views/background.h" #include "ui/views/border.h" diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc index 0b37edd..cd777b2 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc @@ -10,9 +10,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/text_utils.h" #include "ui/views/border.h" diff --git a/chrome/browser/ui/views/autofill/generated_credit_card_bubble_views.cc b/chrome/browser/ui/views/autofill/generated_credit_card_bubble_views.cc index f4f3d43..45087d0 100644 --- a/chrome/browser/ui/views/autofill/generated_credit_card_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/generated_credit_card_bubble_views.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "ui/gfx/font.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/size.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/styled_label.h" diff --git a/chrome/browser/ui/views/autofill/info_bubble.cc b/chrome/browser/ui/views/autofill/info_bubble.cc index e53903b..03172ed 100644 --- a/chrome/browser/ui/views/autofill/info_bubble.cc +++ b/chrome/browser/ui/views/autofill/info_bubble.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/autofill/info_bubble.h" #include "base/i18n/rtl.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/text_constants.h" diff --git a/chrome/browser/ui/views/autofill/info_bubble.h b/chrome/browser/ui/views/autofill/info_bubble.h index 52b8467..e5b09f6 100644 --- a/chrome/browser/ui/views/autofill/info_bubble.h +++ b/chrome/browser/ui/views/autofill/info_bubble.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/bubble/bubble_delegate.h" namespace autofill { diff --git a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc index 6ea35ce..2af2d59 100644 --- a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/size.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/image_view.h" diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc index 8065ba7..94b6f36 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc @@ -9,7 +9,7 @@ #include "chrome/browser/download/download_item_model.h" #include "content/public/browser/download_item.h" #include "content/public/browser/page_navigator.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/controls/menu/menu_runner.h" DownloadShelfContextMenuView::DownloadShelfContextMenuView( diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index ad8511d..fabbcdd 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -17,7 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "ui/aura/window.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_animations.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 0c88979..ebb2bc3 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "components/web_modal/web_contents_modal_dialog_host.h" #include "ui/base/hit_test.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/scrollbar_size.h" #include "ui/gfx/size.h" #include "ui/views/controls/webview/webview.h" diff --git a/chrome/browser/ui/views/message_center/message_center_widget_delegate.h b/chrome/browser/ui/views/message_center/message_center_widget_delegate.h index b5f0609..dcbafdb 100644 --- a/chrome/browser/ui/views/message_center/message_center_widget_delegate.h +++ b/chrome/browser/ui/views/message_center/message_center_widget_delegate.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_tray.h" diff --git a/chrome/browser/ui/views/panels/x11_panel_resizer.h b/chrome/browser/ui/views/panels/x11_panel_resizer.h index 7a10db1..dc7f7c6b 100644 --- a/chrome/browser/ui/views/panels/x11_panel_resizer.h +++ b/chrome/browser/ui/views/panels/x11_panel_resizer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PANELS_X11_PANEL_RESIZER_H_ #include "ui/events/event_handler.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace aura { class Window; diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index d111b2f..d4412b6 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -21,7 +21,7 @@ #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc index fd49c3e..14441a4 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc @@ -8,8 +8,8 @@ #include "base/win/windows_version.h" #include "chrome/browser/ui/views/status_icons/status_tray_win.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/icon_util.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h index db4f633..d824325 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" #include "ui/base/layout.h" #include "ui/gfx/animation/animation_delegate.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/glow_hover_controller.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 5f507dc..b62a242 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_controller.h" #include "ui/gfx/animation/animation_container.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/toolbar/back_button.cc b/chrome/browser/ui/views/toolbar/back_button.cc index d4715f8..1bfc743 100644 --- a/chrome/browser/ui/views/toolbar/back_button.cc +++ b/chrome/browser/ui/views/toolbar/back_button.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/toolbar/back_button.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc index 7ebae59..8836414 100644 --- a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc +++ b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc @@ -10,7 +10,7 @@ #include "components/web_modal/single_web_contents_dialog_manager.h" #include "components/web_modal/web_contents_modal_dialog_host.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" #include "ui/views/border.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 0c1da68..54bdee4 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -30,8 +30,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/insets.h" #include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h index ea3941b..2286e38 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h @@ -15,7 +15,7 @@ #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include "ui/base/ime/chromeos/input_method_manager.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace chromeos { diff --git a/chrome/renderer/pepper/pepper_flash_menu_host.cc b/chrome/renderer/pepper/pepper_flash_menu_host.cc index 9b76aa72..3b7a438 100644 --- a/chrome/renderer/pepper/pepper_flash_menu_host.cc +++ b/chrome/renderer/pepper/pepper_flash_menu_host.cc @@ -14,7 +14,7 @@ #include "ppapi/host/ppapi_host.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_flash_menu.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace { diff --git a/chrome/utility/cloud_print/bitmap_image.h b/chrome/utility/cloud_print/bitmap_image.h index df06aab..8ea6d2c 100644 --- a/chrome/utility/cloud_print/bitmap_image.h +++ b/chrome/utility/cloud_print/bitmap_image.h @@ -6,7 +6,7 @@ #define CHROME_UTILITY_CLOUD_PRINT_BITMAP_IMAGE_H_ #include "base/memory/scoped_ptr.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" namespace cloud_print { diff --git a/components/constrained_window/constrained_window_views_unittest.cc b/components/constrained_window/constrained_window_views_unittest.cc index dc3fefb..09e6b67 100644 --- a/components/constrained_window/constrained_window_views_unittest.cc +++ b/components/constrained_window/constrained_window_views_unittest.cc @@ -5,8 +5,8 @@ #include "components/constrained_window/constrained_window_views.h" #include "components/web_modal/test_web_contents_modal_dialog_host.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/views/border.h" diff --git a/components/pdf/renderer/pepper_pdf_host.cc b/components/pdf/renderer/pepper_pdf_host.cc index 3059932..3a3f587 100644 --- a/components/pdf/renderer/pepper_pdf_host.cc +++ b/components/pdf/renderer/pepper_pdf_host.cc @@ -30,9 +30,9 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/layout.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" -#include "ui/gfx/point.h" namespace pdf { diff --git a/components/web_modal/test_web_contents_modal_dialog_host.cc b/components/web_modal/test_web_contents_modal_dialog_host.cc index c5705fc..28a5d81 100644 --- a/components/web_modal/test_web_contents_modal_dialog_host.cc +++ b/components/web_modal/test_web_contents_modal_dialog_host.cc @@ -4,7 +4,7 @@ #include "components/web_modal/test_web_contents_modal_dialog_host.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace web_modal { diff --git a/content/browser/renderer_host/dip_util.cc b/content/browser/renderer_host/dip_util.cc index 6952dd9..228a41c 100644 --- a/content/browser/renderer_host/dip_util.cc +++ b/content/browser/renderer_host/dip_util.cc @@ -8,8 +8,8 @@ #include "ui/base/layout.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/dip_util.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc index 8800aca..59f4af3 100644 --- a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc +++ b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc @@ -5,7 +5,7 @@ #include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h" #include "base/logging.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/point_f.h" namespace content { namespace { diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 47c15e8..f7da2d3 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -32,7 +32,7 @@ #include "ui/base/touch/selection_bound.h" #include "ui/base/touch/touch_editing_controller.h" #include "ui/gfx/display_observer.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/wm/public/activation_change_observer.h" #include "ui/wm/public/activation_delegate.h" diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 288ead2..f756d65 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -72,7 +72,7 @@ #include "ui/gfx/display.h" #include "ui/gfx/frame_time.h" #include "ui/gfx/geometry/dip_util.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" #include "ui/gfx/screen.h" diff --git a/content/browser/renderer_host/text_input_client_mac.h b/content/browser/renderer_host/text_input_client_mac.h index 6a07947..4e50eff 100644 --- a/content/browser/renderer_host/text_input_client_mac.h +++ b/content/browser/renderer_host/text_input_client_mac.h @@ -12,7 +12,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" template <typename T> struct DefaultSingletonTraits; diff --git a/content/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm index 7650700..090daaa 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.mm +++ b/content/browser/renderer_host/text_input_client_message_filter.mm @@ -10,7 +10,7 @@ #include "content/common/text_input_client_messages.h" #include "content/public/browser/render_widget_host_view.h" #include "ipc/ipc_message_macros.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/range/range.h" namespace content { diff --git a/content/browser/web_contents/touch_editable_impl_aura.h b/content/browser/web_contents/touch_editable_impl_aura.h index 1f6c011..d242df8 100644 --- a/content/browser/web_contents/touch_editable_impl_aura.h +++ b/content/browser/web_contents/touch_editable_impl_aura.h @@ -12,8 +12,8 @@ #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "ui/aura/window_observer.h" #include "ui/base/touch/touch_editing_controller.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc index 6cc1581..2ae2977 100644 --- a/content/browser/web_contents/web_contents_view_guest.cc +++ b/content/browser/web_contents/web_contents_view_guest.cc @@ -17,8 +17,8 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/context_menu_params.h" #include "content/public/common/drop_data.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/content/child/npapi/plugin_instance.h b/content/child/npapi/plugin_instance.h index a776a15..bbffac5 100644 --- a/content/child/npapi/plugin_instance.h +++ b/content/child/npapi/plugin_instance.h @@ -18,8 +18,8 @@ #include "base/memory/ref_counted.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/nphostapi.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "url/gurl.h" diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index 8aec318..79d7141 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -22,8 +22,8 @@ #include "third_party/WebKit/public/web/WebDragOperation.h" #include "third_party/WebKit/public/web/WebDragStatus.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "url/gurl.h" diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h index d53fbd0..6c73337 100644 --- a/content/common/cursors/webcursor.h +++ b/content/common/cursors/webcursor.h @@ -11,8 +11,8 @@ #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/WebCursorInfo.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/size.h" #if defined(USE_AURA) diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm index 2c0c2aa..3a52d83 100644 --- a/content/common/cursors/webcursor_mac.mm +++ b/content/common/cursors/webcursor_mac.mm @@ -15,8 +15,8 @@ #include "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/public/platform/WebCursorInfo.h" #include "third_party/WebKit/public/platform/WebSize.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" using blink::WebCursorInfo; diff --git a/content/common/drag_event_source_info.h b/content/common/drag_event_source_info.h index 59a6f7c..b5177ee 100644 --- a/content/common/drag_event_source_info.h +++ b/content/common/drag_event_source_info.h @@ -7,7 +7,7 @@ #include "content/common/content_export.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace content { diff --git a/content/common/drag_messages.h b/content/common/drag_messages.h index 6f378a8..2be7a3b 100644 --- a/content/common/drag_messages.h +++ b/content/common/drag_messages.h @@ -9,9 +9,9 @@ #include "content/public/common/common_param_traits.h" #include "content/public/common/drop_data.h" #include "ipc/ipc_message_macros.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/public/web/WebDragOperation.h" -#include "ui/gfx/point.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/vector2d.h" #define IPC_MESSAGE_START DragMsgStart diff --git a/content/common/drag_traits.h b/content/common/drag_traits.h index fa8d358..e07e5a0 100644 --- a/content/common/drag_traits.h +++ b/content/common/drag_traits.h @@ -7,7 +7,7 @@ #include "content/public/common/drop_data.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/web/WebDragOperation.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #define IPC_MESSAGE_START DragMsgStart diff --git a/content/common/input/synthetic_pinch_gesture_params.h b/content/common/input/synthetic_pinch_gesture_params.h index ba15caf..194dba4 100644 --- a/content/common/input/synthetic_pinch_gesture_params.h +++ b/content/common/input/synthetic_pinch_gesture_params.h @@ -7,7 +7,7 @@ #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace content { diff --git a/content/common/input/synthetic_smooth_scroll_gesture_params.h b/content/common/input/synthetic_smooth_scroll_gesture_params.h index 05f7357..813d06d 100644 --- a/content/common/input/synthetic_smooth_scroll_gesture_params.h +++ b/content/common/input/synthetic_smooth_scroll_gesture_params.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/vector2d.h" namespace content { diff --git a/content/common/input/synthetic_tap_gesture_params.h b/content/common/input/synthetic_tap_gesture_params.h index c4ca576..3b05c13 100644 --- a/content/common/input/synthetic_tap_gesture_params.h +++ b/content/common/input/synthetic_tap_gesture_params.h @@ -7,7 +7,7 @@ #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace content { diff --git a/content/common/page_state_serialization.h b/content/common/page_state_serialization.h index c3bf499..a23ab5f 100644 --- a/content/common/page_state_serialization.h +++ b/content/common/page_state_serialization.h @@ -11,8 +11,8 @@ #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_f.h" #include "url/gurl.h" namespace content { diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h index 8849dae..9fe170a 100644 --- a/content/public/common/context_menu_params.h +++ b/content/public/common/context_menu_params.h @@ -20,7 +20,7 @@ #include "url/gurl.h" #if defined(OS_ANDROID) -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #endif namespace content { diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h index 06e3715..da73747 100644 --- a/content/renderer/external_popup_menu.h +++ b/content/renderer/external_popup_menu.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "third_party/WebKit/public/web/WebExternalPopupMenu.h" #include "third_party/WebKit/public/web/WebPopupMenuInfo.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace blink { class WebExternalPopupMenuClient; diff --git a/content/renderer/pepper/gfx_conversion.h b/content/renderer/pepper/gfx_conversion.h index 1c1fa11..e54a16e 100644 --- a/content/renderer/pepper/gfx_conversion.h +++ b/content/renderer/pepper/gfx_conversion.h @@ -8,7 +8,7 @@ #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_size.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_f.h" #include "ui/gfx/size.h" diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.cc b/content/renderer/pepper/mock_renderer_ppapi_host.cc index 0f7b6e8..1ff1ec5 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.cc +++ b/content/renderer/pepper/mock_renderer_ppapi_host.cc @@ -5,7 +5,7 @@ #include "content/renderer/pepper/mock_renderer_ppapi_host.h" #include "content/renderer/pepper/fake_pepper_plugin_instance.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace content { diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index edadacd..316a4ab 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc @@ -31,7 +31,7 @@ #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/blit.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index 088e385..2b70dc8 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -16,7 +16,7 @@ #include "ppapi/host/resource_host.h" #include "third_party/WebKit/public/platform/WebCanvas.h" #include "ui/events/latency_info.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" namespace cc { diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc index 11af685..6817495 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc @@ -16,7 +16,7 @@ #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/events/latency_info.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" using blink::WebCanvas; diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index b6e6e9e..ed210a3 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc @@ -27,7 +27,7 @@ #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebPluginContainer.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace content { // static diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 3d7d397..d37337b 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -183,8 +183,8 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/ui_base_switches_util.h" #include "ui/events/latency_info.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size_conversions.h" diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index fa10e41..9f4c53f 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -68,7 +68,7 @@ #include "third_party/skia/include/core/SkShader.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index c8d1b4a..f7e8723 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "build/build_config.h" #include "content/public/renderer/render_view_observer.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/range/range.h" namespace blink { diff --git a/extensions/browser/app_window/native_app_window.h b/extensions/browser/app_window/native_app_window.h index bb7e467..ddac559 100644 --- a/extensions/browser/app_window/native_app_window.h +++ b/extensions/browser/app_window/native_app_window.h @@ -11,7 +11,7 @@ #include "components/web_modal/web_contents_modal_dialog_host.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/base_window.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" namespace content { struct NativeWebKeyboardEvent; diff --git a/extensions/browser/app_window/size_constraints.cc b/extensions/browser/app_window/size_constraints.cc index 250d876..6d248c1 100644 --- a/extensions/browser/app_window/size_constraints.cc +++ b/extensions/browser/app_window/size_constraints.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" namespace extensions { diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index abea883..307f750 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -14,7 +14,7 @@ #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/limits.h" #include "media/base/video_util.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #if !defined(MEDIA_FOR_CAST_IOS) #include "third_party/skia/include/core/SkBitmap.h" diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc index 80a7095..6082abe 100644 --- a/printing/emf_win_unittest.cc +++ b/printing/emf_win_unittest.cc @@ -19,7 +19,7 @@ #include "base/win/scoped_hdc.h" #include "printing/printing_context.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" namespace printing { diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index c63e308..486b3ab 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -18,7 +18,7 @@ #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/pdf/SkPDFDevice.h" #include "third_party/skia/include/pdf/SkPDFDocument.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc index 8987b34..23333c8 100644 --- a/ui/app_list/views/app_list_item_view.cc +++ b/ui/app_list/views/app_list_item_view.cc @@ -23,8 +23,8 @@ #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/point.h" #include "ui/gfx/shadow_value.h" #include "ui/gfx/transform_util.h" #include "ui/strings/grit/ui_strings.h" diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc index 01058c6..557fb6d 100644 --- a/ui/app_list/views/app_list_view.cc +++ b/ui/app_list/views/app_list_view.cc @@ -30,8 +30,8 @@ #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/skia_util.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/app_list/views/progress_bar_view.cc b/ui/app_list/views/progress_bar_view.cc index 5a7094b..7067e69 100644 --- a/ui/app_list/views/progress_bar_view.cc +++ b/ui/app_list/views/progress_bar_view.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/insets.h" #include "ui/resources/grit/ui_resources.h" #include "ui/views/painter.h" diff --git a/ui/aura/env.h b/ui/aura/env.h index f04c7a5..4ae2d69 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -11,7 +11,7 @@ #include "ui/aura/aura_export.h" #include "ui/events/event_handler.h" #include "ui/events/event_target.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui { class ContextFactory; diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index 23cbfbde..4a73acf 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -24,7 +24,7 @@ #include "ui/events/gestures/gesture_types.h" #include "ui/events/test/event_generator.h" #include "ui/events/test/events_test_utils.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include <queue> diff --git a/ui/aura/remote_window_tree_host_win.cc b/ui/aura/remote_window_tree_host_win.cc index 6d4367b..3b34357 100644 --- a/ui/aura/remote_window_tree_host_win.cc +++ b/ui/aura/remote_window_tree_host_win.cc @@ -23,7 +23,7 @@ #include "ui/base/view_prop.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/win/dpi.h" #include "ui/metro_viewer/metro_viewer_messages.h" diff --git a/ui/aura/window.h b/ui/aura/window.h index d1cff7b..3d99452 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -24,7 +24,7 @@ #include "ui/events/event_target.h" #include "ui/events/event_targeter.h" #include "ui/events/gestures/gesture_types.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/wm/public/window_types.h" diff --git a/ui/aura/window_event_dispatcher.h b/ui/aura/window_event_dispatcher.h index 6b1cadc..d2ea8a9 100644 --- a/ui/aura/window_event_dispatcher.h +++ b/ui/aura/window_event_dispatcher.h @@ -24,8 +24,8 @@ #include "ui/events/event_targeter.h" #include "ui/events/gestures/gesture_recognizer.h" #include "ui/events/gestures/gesture_types.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" namespace gfx { class Size; diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc index b9994ed..1f1d4fe 100644 --- a/ui/aura/window_event_dispatcher_unittest.cc +++ b/ui/aura/window_event_dispatcher_unittest.cc @@ -29,7 +29,7 @@ #include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/test/event_generator.h" #include "ui/events/test/test_event_handler.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform.h" diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc index bbe52fc..a96c94d 100644 --- a/ui/aura/window_tree_host.cc +++ b/ui/aura/window_tree_host.cc @@ -17,10 +17,10 @@ #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/gfx/display.h" -#include "ui/gfx/insets.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" diff --git a/ui/aura/window_tree_host_mac.h b/ui/aura/window_tree_host_mac.h index f71f167..45063c1 100644 --- a/ui/aura/window_tree_host_mac.h +++ b/ui/aura/window_tree_host_mac.h @@ -10,7 +10,7 @@ #include "base/mac/scoped_nsobject.h" #include "ui/aura/aura_export.h" #include "ui/aura/window_tree_host.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/ui/aura/window_tree_host_win.cc b/ui/aura/window_tree_host_win.cc index 9a30344..f046c20 100644 --- a/ui/aura/window_tree_host_win.cc +++ b/ui/aura/window_tree_host_win.cc @@ -16,7 +16,7 @@ #include "ui/compositor/compositor.h" #include "ui/events/event.h" #include "ui/gfx/display.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/screen.h" #include "ui/platform_window/win/win_window.h" diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h index aff874c..428c7de 100644 --- a/ui/aura/window_tree_host_x11.h +++ b/ui/aura/window_tree_host_x11.h @@ -10,7 +10,7 @@ #include "ui/aura/window_tree_host.h" #include "ui/events/event_source.h" #include "ui/events/platform/platform_event_dispatcher.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/x/x11_atom_cache.h" diff --git a/ui/base/cursor/cursor_loader.h b/ui/base/cursor/cursor_loader.h index d4a0c3d..f69d23c 100644 --- a/ui/base/cursor/cursor_loader.h +++ b/ui/base/cursor/cursor_loader.h @@ -9,8 +9,8 @@ #include "base/strings/string16.h" #include "ui/base/ui_base_export.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc index e9fb7a7..7769fe0 100644 --- a/ui/base/cursor/cursor_loader_x11.cc +++ b/ui/base/cursor/cursor_loader_x11.cc @@ -5,16 +5,16 @@ #include "ui/base/cursor/cursor_loader_x11.h" #include <float.h> -#include <X11/Xlib.h> #include <X11/cursorfont.h> +#include <X11/Xlib.h> #include "base/logging.h" #include "skia/ext/image_operations.h" #include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_util.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" diff --git a/ui/base/cursor/cursor_util.cc b/ui/base/cursor/cursor_util.cc index bddb1bc..6e2102b 100644 --- a/ui/base/cursor/cursor_util.cc +++ b/ui/base/cursor/cursor_util.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "skia/ext/image_operations.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" diff --git a/ui/base/cursor/cursors_aura.cc b/ui/base/cursor/cursors_aura.cc index e244b19..fdf4bb0 100644 --- a/ui/base/cursor/cursors_aura.cc +++ b/ui/base/cursor/cursors_aura.cc @@ -6,8 +6,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/point.h" #include "ui/resources/grit/ui_resources.h" namespace ui { diff --git a/ui/base/cursor/image_cursors.cc b/ui/base/cursor/image_cursors.cc index b4c19fc..e69a794 100644 --- a/ui/base/cursor/image_cursors.cc +++ b/ui/base/cursor/image_cursors.cc @@ -12,7 +12,7 @@ #include "ui/base/cursor/cursor_loader.h" #include "ui/base/cursor/cursors_aura.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui { diff --git a/ui/base/test/ui_controls_win.cc b/ui/base/test/ui_controls_win.cc index fc3f6ea..f70c433 100644 --- a/ui/base/test/ui_controls_win.cc +++ b/ui/base/test/ui_controls_win.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/message_loop/message_loop.h" #include "ui/base/test/ui_controls_internal_win.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui_controls { bool g_ui_controls_enabled = false; diff --git a/ui/base/touch/selection_bound.h b/ui/base/touch/selection_bound.h index f7f0f97..27d734a 100644 --- a/ui/base/touch/selection_bound.h +++ b/ui/base/touch/selection_bound.h @@ -6,8 +6,8 @@ #define UI_BASE_TOUCH_SELECTION_BOUND_H_ #include "ui/base/ui_base_export.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_f.h" namespace cc { struct ViewportSelectionBound; diff --git a/ui/compositor/debug_utils.cc b/ui/compositor/debug_utils.cc index cae3abc..a2e4b2c 100644 --- a/ui/compositor/debug_utils.cc +++ b/ui/compositor/debug_utils.cc @@ -14,9 +14,9 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "ui/compositor/layer.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/interpolated_transform.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/transform.h" using base::UTF8ToWide; diff --git a/ui/compositor/dip_util.cc b/ui/compositor/dip_util.cc index ad85159..572f5e7 100644 --- a/ui/compositor/dip_util.cc +++ b/ui/compositor/dip_util.cc @@ -11,8 +11,8 @@ #include "ui/compositor/layer.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/dip_util.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size.h" diff --git a/ui/compositor/dip_util.h b/ui/compositor/dip_util.h index cac3681..b4c0257 100644 --- a/ui/compositor/dip_util.h +++ b/ui/compositor/dip_util.h @@ -5,9 +5,9 @@ #ifndef UI_COMPOSITOR_DIP_UTIL_H_ #define UI_COMPOSITOR_DIP_UTIL_H_ -#include "ui/compositor/compositor_export.h" #include "base/basictypes.h" -#include "ui/gfx/point_f.h" +#include "ui/compositor/compositor_export.h" +#include "ui/gfx/geometry/point_f.h" namespace gfx { class Point; diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index 01d2bb2..f88ad811 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -31,9 +31,9 @@ #include "ui/gfx/animation/animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/interpolated_transform.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/size_conversions.h" namespace { diff --git a/ui/events/cocoa/events_mac.mm b/ui/events/cocoa/events_mac.mm index 99d3916..a028596 100644 --- a/ui/events/cocoa/events_mac.mm +++ b/ui/events/cocoa/events_mac.mm @@ -6,15 +6,15 @@ #include <Cocoa/Cocoa.h> +#include "base/logging.h" #import "base/mac/mac_util.h" #import "base/mac/sdk_forward_declarations.h" -#include "base/logging.h" #include "base/time/time.h" #include "build/build_config.h" #include "ui/events/cocoa/cocoa_event_utils.h" #include "ui/events/event_utils.h" #import "ui/events/keycodes/keyboard_code_conversion_mac.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/vector2d.h" namespace ui { diff --git a/ui/events/cocoa/events_mac_unittest.mm b/ui/events/cocoa/events_mac_unittest.mm index f58cfd0..c4169bf 100644 --- a/ui/events/cocoa/events_mac_unittest.mm +++ b/ui/events/cocoa/events_mac_unittest.mm @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event_constants.h" #import "ui/events/test/cocoa_test_event_utils.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #import "ui/gfx/test/ui_cocoa_test_helper.h" namespace { diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc index 9db81c1..68fdb2c 100644 --- a/ui/events/devices/x11/device_data_manager_x11.cc +++ b/ui/events/devices/x11/device_data_manager_x11.cc @@ -20,7 +20,7 @@ #include "ui/events/event_switches.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/gfx/display.h" -#include "ui/gfx/point3_f.h" +#include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/x/x11_types.h" // XIScrollClass was introduced in XI 2.1 so we need to define it here diff --git a/ui/events/event.cc b/ui/events/event.cc index 0b40653..55ccc64 100644 --- a/ui/events/event.cc +++ b/ui/events/event.cc @@ -6,8 +6,8 @@ #if defined(USE_X11) #include <X11/extensions/XInput2.h> -#include <X11/Xlib.h> #include <X11/keysym.h> +#include <X11/Xlib.h> #endif #include <cmath> @@ -20,9 +20,9 @@ #include "ui/events/keycodes/dom3/dom_key.h" #include "ui/events/keycodes/dom4/keycode_converter.h" #include "ui/events/keycodes/keyboard_code_conversion.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/safe_integer_conversions.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/transform.h" #include "ui/gfx/transform_util.h" diff --git a/ui/events/event.h b/ui/events/event.h index ded76c4..757d992 100644 --- a/ui/events/event.h +++ b/ui/events/event.h @@ -17,8 +17,8 @@ #include "ui/events/gestures/gesture_types.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/latency_info.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" namespace gfx { class Transform; diff --git a/ui/events/events_stub.cc b/ui/events/events_stub.cc index d021497..090f84b 100644 --- a/ui/events/events_stub.cc +++ b/ui/events/events_stub.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/dom3/dom_code.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/vector2d.h" namespace ui { diff --git a/ui/events/gestures/gesture_recognizer_impl.h b/ui/events/gestures/gesture_recognizer_impl.h index c7bea45..45903ae 100644 --- a/ui/events/gestures/gesture_recognizer_impl.h +++ b/ui/events/gestures/gesture_recognizer_impl.h @@ -14,7 +14,7 @@ #include "ui/events/events_export.h" #include "ui/events/gestures/gesture_provider_aura.h" #include "ui/events/gestures/gesture_recognizer.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui { class GestureConsumer; diff --git a/ui/events/test/event_generator.h b/ui/events/test/event_generator.h index 138f9ae..c2b95ff 100644 --- a/ui/events/test/event_generator.h +++ b/ui/events/test/event_generator.h @@ -14,8 +14,8 @@ #include "base/time/time.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" namespace base { class TickClock; diff --git a/ui/events/test/events_test_utils_x11.h b/ui/events/test/events_test_utils_x11.h index e95693a..85137cb 100644 --- a/ui/events/test/events_test_utils_x11.h +++ b/ui/events/test/events_test_utils_x11.h @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/device_data_manager_x11.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/x/x11_types.h" typedef union _XEvent XEvent; diff --git a/ui/events/win/events_win.cc b/ui/events/win/events_win.cc index 19c70bd..ccdb2be 100644 --- a/ui/events/win/events_win.cc +++ b/ui/events/win/events_win.cc @@ -11,7 +11,7 @@ #include "base/win/win_util.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_win.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/win/dpi.h" namespace ui { diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc index 3014316..0dd9eb9 100644 --- a/ui/events/x/events_x.cc +++ b/ui/events/x/events_x.cc @@ -21,7 +21,7 @@ #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/gfx/display.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/x/x11_atom_cache.h" diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc index 86ecfec..065e804 100644 --- a/ui/events/x/events_x_unittest.cc +++ b/ui/events/x/events_x_unittest.cc @@ -23,7 +23,7 @@ #include "ui/events/event_utils.h" #include "ui/events/test/events_test_utils.h" #include "ui/events/test/events_test_utils_x11.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace ui { diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc index 653c56b..3dd3252 100644 --- a/ui/gfx/blit.cc +++ b/ui/gfx/blit.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "skia/ext/platform_canvas.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/vector2d.h" diff --git a/ui/gfx/blit_unittest.cc b/ui/gfx/blit_unittest.cc index dea0139..0c932cc 100644 --- a/ui/gfx/blit_unittest.cc +++ b/ui/gfx/blit_unittest.cc @@ -7,7 +7,7 @@ #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/blit.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" namespace { diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc index a0d3705..a985e66 100644 --- a/ui/gfx/canvas_skia.cc +++ b/ui/gfx/canvas_skia.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/safe_integer_conversions.h" -#include "ui/gfx/insets.h" #include "ui/gfx/range/range.h" #include "ui/gfx/rect.h" #include "ui/gfx/render_text.h" diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc index 8f01408..92e4120 100644 --- a/ui/gfx/display.cc +++ b/ui/gfx/display.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "ui/gfx/insets.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/point_f.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/switches.h" diff --git a/ui/gfx/display_unittest.cc b/ui/gfx/display_unittest.cc index 3ab7aae..7decdb6 100644 --- a/ui/gfx/display_unittest.cc +++ b/ui/gfx/display_unittest.cc @@ -5,7 +5,7 @@ #include "ui/gfx/display.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" namespace { diff --git a/ui/gfx/geometry/dip_util.cc b/ui/gfx/geometry/dip_util.cc index 21465e0..fc86ecd 100644 --- a/ui/gfx/geometry/dip_util.cc +++ b/ui/gfx/geometry/dip_util.cc @@ -4,9 +4,9 @@ #include "ui/gfx/geometry/dip_util.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/point_f.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size.h" diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h index 0cb3508..295b949 100644 --- a/ui/gfx/icon_util.h +++ b/ui/gfx/icon_util.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/point.h" #include "ui/gfx/size.h" namespace base { diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc index a1fefce..4bc361a 100644 --- a/ui/gfx/image/image_skia_operations.cc +++ b/ui/gfx/image/image_skia_operations.cc @@ -8,13 +8,13 @@ #include "base/logging.h" #include "skia/ext/image_operations.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/insets.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size.h" diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h index 8194080..c7e9032 100644 --- a/ui/gfx/interpolated_transform.h +++ b/ui/gfx/interpolated_transform.h @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/geometry/vector3d_f.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point3_f.h" #include "ui/gfx/transform.h" #include "ui/gfx/transform_util.h" diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc index 8a7133d..106258d 100644 --- a/ui/gfx/nine_image_painter.cc +++ b/ui/gfx/nine_image_painter.cc @@ -10,10 +10,10 @@ #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkScalar.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/scoped_canvas.h" #include "ui/gfx/skia_util.h" diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index c569b9e..6d1067f 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -18,8 +18,8 @@ #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/safe_integer_conversions.h" -#include "ui/gfx/insets.h" #include "ui/gfx/render_text_harfbuzz.h" #include "ui/gfx/scoped_canvas.h" #include "ui/gfx/skia_util.h" diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h index 7b03df0..de9d988 100644 --- a/ui/gfx/render_text.h +++ b/ui/gfx/render_text.h @@ -21,7 +21,7 @@ #include "ui/gfx/break_list.h" #include "ui/gfx/font_list.h" #include "ui/gfx/font_render_params.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/range/range.h" #include "ui/gfx/rect.h" #include "ui/gfx/selection_model.h" diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h index a05866a..44b58c3 100644 --- a/ui/gfx/screen.h +++ b/ui/gfx/screen.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/gfx_export.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/screen_type_delegate.h" namespace gfx { diff --git a/ui/gfx/shadow_value.cc b/ui/gfx/shadow_value.cc index 4b24af1..3bef43a 100644 --- a/ui/gfx/shadow_value.cc +++ b/ui/gfx/shadow_value.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/strings/stringprintf.h" -#include "ui/gfx/insets.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point_conversions.h" namespace gfx { diff --git a/ui/gfx/shadow_value.h b/ui/gfx/shadow_value.h index 60b601e..a361068 100644 --- a/ui/gfx/shadow_value.h +++ b/ui/gfx/shadow_value.h @@ -9,8 +9,8 @@ #include <vector> #include "third_party/skia/include/core/SkColor.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/point.h" namespace gfx { diff --git a/ui/gfx/shadow_value_unittest.cc b/ui/gfx/shadow_value_unittest.cc index bf19664..4cb717e 100644 --- a/ui/gfx/shadow_value_unittest.cc +++ b/ui/gfx/shadow_value_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/shadow_value.h" namespace gfx { diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc index d1f255e..76e0c8d 100644 --- a/ui/gfx/skbitmap_operations.cc +++ b/ui/gfx/skbitmap_operations.cc @@ -4,8 +4,8 @@ #include "ui/gfx/skbitmap_operations.h" -#include <algorithm> #include <string.h> +#include <algorithm> #include "base/logging.h" #include "skia/ext/refptr.h" @@ -15,8 +15,8 @@ #include "third_party/skia/include/core/SkColorPriv.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" -#include "ui/gfx/insets.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/size.h" // static diff --git a/ui/gfx/transform_util.cc b/ui/gfx/transform_util.cc index 97604d5..66b76ba0 100644 --- a/ui/gfx/transform_util.cc +++ b/ui/gfx/transform_util.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point3_f.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/rect.h" namespace gfx { diff --git a/ui/gfx/transform_util.h b/ui/gfx/transform_util.h index b339f68..597d877 100644 --- a/ui/gfx/transform_util.h +++ b/ui/gfx/transform_util.h @@ -5,8 +5,8 @@ #ifndef UI_GFX_TRANSFORM_UTIL_H_ #define UI_GFX_TRANSFORM_UTIL_H_ +#include "ui/gfx/geometry/point.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/point.h" #include "ui/gfx/transform.h" namespace gfx { diff --git a/ui/gfx/transform_util_unittest.cc b/ui/gfx/transform_util_unittest.cc index 2d01ddd..029b9e14 100644 --- a/ui/gfx/transform_util_unittest.cc +++ b/ui/gfx/transform_util_unittest.cc @@ -5,8 +5,8 @@ #include "ui/gfx/transform_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/point.h" -#include "ui/gfx/point3_f.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/rect.h" namespace gfx { diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc index 6ea9ba8..4dd753c 100644 --- a/ui/gfx/win/dpi.cc +++ b/ui/gfx/win/dpi.cc @@ -7,7 +7,7 @@ #include <windows.h> #include "base/win/scoped_hdc.h" #include "ui/gfx/display.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/size_conversions.h" diff --git a/ui/gfx/win/dpi.h b/ui/gfx/win/dpi.h index 02c798c..f6f393d 100644 --- a/ui/gfx/win/dpi.h +++ b/ui/gfx/win/dpi.h @@ -5,8 +5,8 @@ #ifndef UI_GFX_DPI_WIN_H_ #define UI_GFX_DPI_WIN_H_ +#include "ui/gfx/geometry/point.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/ui/gfx/win/hwnd_util.cc b/ui/gfx/win/hwnd_util.cc index 98d71af..ed20010 100644 --- a/ui/gfx/win/hwnd_util.cc +++ b/ui/gfx/win/hwnd_util.cc @@ -9,7 +9,7 @@ #include "base/tracked_objects.h" #include "base/win/metro.h" #include "base/win/win_util.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc index b9b6f16..73ef779 100644 --- a/ui/message_center/views/message_center_view.cc +++ b/ui/message_center/views/message_center_view.cc @@ -15,7 +15,7 @@ #include "ui/gfx/animation/multi_animation.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/message_center/message_center.h" diff --git a/ui/message_center/views/message_view.h b/ui/message_center/views/message_view.h index d995865e..28cd607 100644 --- a/ui/message_center/views/message_view.h +++ b/ui/message_center/views/message_view.h @@ -9,9 +9,9 @@ #include "base/strings/string16.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/insets.h" #include "ui/message_center/message_center_export.h" #include "ui/message_center/notification.h" #include "ui/views/controls/button/button.h" diff --git a/ui/message_center/views/toast_contents_view.h b/ui/message_center/views/toast_contents_view.h index 7f4c749..7e236fa 100644 --- a/ui/message_center/views/toast_contents_view.h +++ b/ui/message_center/views/toast_contents_view.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "ui/gfx/animation/animation_delegate.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/message_center/views/message_center_controller.h" diff --git a/ui/views/border.h b/ui/views/border.h index d2657c6..ebd291c 100644 --- a/ui/views/border.h +++ b/ui/views/border.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/views_export.h" namespace gfx{ diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h index cfe1433..87fc1d7 100644 --- a/ui/views/bubble/bubble_frame_view.h +++ b/ui/views/bubble/bubble_frame_view.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/controls/button/button.h" #include "ui/views/window/non_client_view.h" diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc index 17fd942..6da6748 100644 --- a/ui/views/bubble/bubble_frame_view_unittest.cc +++ b/ui/views/bubble/bubble_frame_view_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc index 4d231a7d..ee57bba 100644 --- a/ui/views/bubble/tray_bubble_view.cc +++ b/ui/views/bubble/tray_bubble_view.cc @@ -17,7 +17,7 @@ #include "ui/compositor/layer_delegate.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/rect.h" #include "ui/gfx/skia_util.h" diff --git a/ui/views/controls/button/label_button_border.h b/ui/views/controls/button/label_button_border.h index 2c9ccc9..c56f42e 100644 --- a/ui/views/controls/button/label_button_border.h +++ b/ui/views/controls/button/label_button_border.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/border.h" #include "ui/views/controls/button/button.h" #include "ui/views/painter.h" diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc index 0e4f3a2..74b4875 100644 --- a/ui/views/controls/focusable_border.cc +++ b/ui/views/controls/focusable_border.cc @@ -5,7 +5,7 @@ #include "ui/views/controls/focusable_border.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc index 5b758f8..e7417ea 100644 --- a/ui/views/controls/image_view.cc +++ b/ui/views/controls/image_view.cc @@ -9,7 +9,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "ui/accessibility/ax_view_state.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/painter.h" namespace views { diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index 11b5417..05aaaab 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc @@ -18,7 +18,7 @@ #include "ui/accessibility/ax_view_state.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/text_elider.h" #include "ui/gfx/text_utils.h" #include "ui/gfx/utf16_indexing.h" diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 5ecf691..cd6f5d3 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -13,8 +13,8 @@ #include "ui/events/event.h" #include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/gfx/screen.h" #include "ui/gfx/vector2d.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc index 203bf29..6247ace 100644 --- a/ui/views/controls/menu/menu_image_util.cc +++ b/ui/views/controls/menu/menu_image_util.cc @@ -9,11 +9,11 @@ #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/point.h" #include "ui/gfx/size.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.h b/ui/views/controls/scrollbar/native_scroll_bar_views.h index bb4ecdb..e201b2e 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_ #include "base/compiler_specific.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/scrollbar/base_scroll_bar.h" diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc index 71d719e..446c965 100644 --- a/ui/views/controls/slider.cc +++ b/ui/views/controls/slider.cc @@ -18,7 +18,7 @@ #include "ui/events/event.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 2b91604..869fb66 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -19,7 +19,7 @@ #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" #include "ui/native_theme/native_theme.h" #include "ui/strings/grit/ui_strings.h" diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index e3be802..87500b3 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -12,7 +12,7 @@ #include "base/timer/timer.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/views_export.h" #include "ui/wm/public/tooltip_client.h" diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index c787155..0ce3fb4 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -15,7 +15,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/events/test/event_generator.h" #include "ui/gfx/font.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/screen.h" #include "ui/gfx/screen_type_delegate.h" #include "ui/gfx/text_elider.h" diff --git a/ui/views/corewm/tooltip_win.h b/ui/views/corewm/tooltip_win.h index 23ee640..3f3e51b 100644 --- a/ui/views/corewm/tooltip_win.h +++ b/ui/views/corewm/tooltip_win.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/corewm/tooltip.h" #include <windows.h> diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h index 8b11ced..0a82bb4 100644 --- a/ui/views/layout/box_layout.h +++ b/ui/views/layout/box_layout.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/layout/layout_manager.h" namespace gfx { diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 97c62e3f..38d20c4 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/view.h" #include "ui/views/window/dialog_delegate.h" diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h index 20084c0..b442d3b 100644 --- a/ui/views/layout/grid_layout.h +++ b/ui/views/layout/grid_layout.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/layout/layout_manager.h" #include "ui/views/view.h" diff --git a/ui/views/mouse_watcher.h b/ui/views/mouse_watcher.h index 8907687..592266a 100644 --- a/ui/views/mouse_watcher.h +++ b/ui/views/mouse_watcher.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/views/views_export.h" namespace gfx { diff --git a/ui/views/painter.cc b/ui/views/painter.cc index 2dcb0c4..f3570af 100644 --- a/ui/views/painter.cc +++ b/ui/views/painter.cc @@ -9,12 +9,12 @@ #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/insets.h" #include "ui/gfx/nine_image_painter.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" diff --git a/ui/views/rect_based_targeting_utils.cc b/ui/views/rect_based_targeting_utils.cc index de4d346..0f8bf67 100644 --- a/ui/views/rect_based_targeting_utils.cc +++ b/ui/views/rect_based_targeting_utils.cc @@ -4,7 +4,7 @@ #include "ui/views/rect_based_targeting_utils.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" namespace views { diff --git a/ui/views/shadow_border.cc b/ui/views/shadow_border.cc index 3cd21c9..c7dc051 100644 --- a/ui/views/shadow_border.cc +++ b/ui/views/shadow_border.cc @@ -5,7 +5,7 @@ #include "ui/views/shadow_border.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/shadow_value.h" #include "ui/gfx/skia_util.h" diff --git a/ui/views/touchui/touch_editing_menu.cc b/ui/views/touchui/touch_editing_menu.cc index bb9a7a6..7b2c5b6 100644 --- a/ui/views/touchui/touch_editing_menu.cc +++ b/ui/views/touchui/touch_editing_menu.cc @@ -9,7 +9,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/text_utils.h" #include "ui/strings/grit/ui_strings.h" #include "ui/views/bubble/bubble_border.h" diff --git a/ui/views/touchui/touch_editing_menu.h b/ui/views/touchui/touch_editing_menu.h index 8f325c5..6aa1343 100644 --- a/ui/views/touchui/touch_editing_menu.h +++ b/ui/views/touchui/touch_editing_menu.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_ #define UI_VIEWS_TOUCHUI_TOUCH_EDITING_MENU_H_ -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/button.h" #include "ui/views/views_export.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index ce4e0ab..a59747d 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h @@ -9,7 +9,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/touch/selection_bound.h" #include "ui/base/touch/touch_editing_controller.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/touchui/touch_editing_menu.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index f5d26a9..078b733 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -12,7 +12,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/events/test/event_generator.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/render_text.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/views/view.cc b/ui/views/view.cc index 5dcd4e7..7bf2ee6 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -25,10 +25,10 @@ #include "ui/compositor/layer_animator.h" #include "ui/events/event_target_iterator.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/path.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/point_conversions.h" #include "ui/gfx/scoped_canvas.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" diff --git a/ui/views/view.h b/ui/views/view.h index a38f3ce..b44def4 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -26,8 +26,8 @@ #include "ui/compositor/layer_owner.h" #include "ui/events/event.h" #include "ui/events/event_target.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/r_tree.h" -#include "ui/gfx/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/vector2d.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h index d8ccb0e..880aa5d 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h @@ -5,9 +5,9 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ +#include <X11/Xlib.h> #include <set> #include <vector> -#include <X11/Xlib.h> #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -16,7 +16,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursor.h" #include "ui/base/dragdrop/drag_drop_types.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/x/x11_atom_cache.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/x11_move_loop_delegate.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index c92dab1..79b9842 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -19,7 +19,7 @@ #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index 3752373..7306a1c 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -16,7 +16,7 @@ #include "ui/base/ime/input_method.h" #include "ui/base/win/shell.h" #include "ui/compositor/compositor_constants.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/path.h" #include "ui/gfx/path_win.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index dd8aa40..5688da2 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -31,9 +31,9 @@ #include "ui/events/platform/platform_event_source.h" #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" -#include "ui/gfx/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/path_x11.h" #include "ui/gfx/screen.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h index 1a4f725..902d645 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -16,7 +16,7 @@ #include "ui/base/cursor/cursor_loader_x11.h" #include "ui/events/event_source.h" #include "ui/events/platform/platform_event_dispatcher.h" -#include "ui/gfx/insets.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/x/x11_atom_cache.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc index 3deab41..62310df 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc @@ -18,8 +18,8 @@ #include "ui/base/hit_test.h" #include "ui/base/x/x11_util.h" #include "ui/events/platform/x11/x11_event_source.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/path.h" -#include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/x/x11_atom_cache.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h index d690142..de14fab 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h +++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/x11_move_loop_delegate.h" #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h index 12a1aca..4f26efc 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h @@ -8,7 +8,7 @@ #include <set> #include "ui/base/x/x11_util.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/views_export.h" namespace aura { diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h index 2c2b458..a7ac414 100644 --- a/ui/views/widget/tooltip_manager_aura.h +++ b/ui/views/widget/tooltip_manager_aura.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/views/widget/tooltip_manager.h" namespace aura { diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 3848c01..92545cf 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -19,8 +19,8 @@ #include "ui/events/event_processor.h" #include "ui/events/event_utils.h" #include "ui/events/test/event_generator.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/test/test_views_delegate.h" diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index 6ab356f8..ea4fdbd 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -29,8 +29,8 @@ #include "ui/events/keycodes/keyboard_code_conversion_win.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/geometry/insets.h" #include "ui/gfx/icon_util.h" -#include "ui/gfx/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/path_win.h" #include "ui/gfx/screen.h" diff --git a/ui/wm/core/coordinate_conversion.cc b/ui/wm/core/coordinate_conversion.cc index 6227b37..1d97f04 100644 --- a/ui/wm/core/coordinate_conversion.cc +++ b/ui/wm/core/coordinate_conversion.cc @@ -5,7 +5,7 @@ #include "ui/wm/core/coordinate_conversion.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace wm { diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h index a10b8ac..8288b22 100644 --- a/ui/wm/core/cursor_manager.h +++ b/ui/wm/core/cursor_manager.h @@ -11,8 +11,8 @@ #include "base/observer_list.h" #include "ui/aura/client/cursor_client.h" #include "ui/base/cursor/cursor.h" +#include "ui/gfx/geometry/point.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/point.h" #include "ui/wm/core/native_cursor_manager_delegate.h" #include "ui/wm/wm_export.h" diff --git a/ui/wm/core/default_screen_position_client.cc b/ui/wm/core/default_screen_position_client.cc index 25903d9..c9dadc8 100644 --- a/ui/wm/core/default_screen_position_client.cc +++ b/ui/wm/core/default_screen_position_client.cc @@ -6,7 +6,7 @@ #include "ui/aura/window_tree_host.h" #include "ui/gfx/display.h" -#include "ui/gfx/point_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/screen.h" namespace wm { diff --git a/ui/wm/core/user_activity_detector_unittest.cc b/ui/wm/core/user_activity_detector_unittest.cc index 71e1f2d..9f43c62 100644 --- a/ui/wm/core/user_activity_detector_unittest.cc +++ b/ui/wm/core/user_activity_detector_unittest.cc @@ -11,7 +11,7 @@ #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" #include "ui/wm/core/user_activity_observer.h" namespace wm { |