diff options
| author | tfarina <tfarina@chromium.org> | 2015-01-02 20:25:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-03 04:26:28 +0000 |
| commit | ebe974f000199a7020da9855e326b31daad59be3 (patch) | |
| tree | 8d8229f8c47763ab9e1fabf12da07175adce5c5e /ui | |
| parent | 1ca83b0ff277b7ec1d10ed3a14dcca823ce72249 (diff) | |
| download | chromium_src-ebe974f000199a7020da9855e326b31daad59be3.zip chromium_src-ebe974f000199a7020da9855e326b31daad59be3.tar.gz chromium_src-ebe974f000199a7020da9855e326b31daad59be3.tar.bz2 | |
Cleanup: Update the path to gfx size headers.
The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so
we are updating the include paths to fix this.
BUG=395370
TEST=compiles
TBR=sky@chromium.org,danakj@chromium.org
Review URL: https://codereview.chromium.org/832953002
Cr-Commit-Position: refs/heads/master@{#309873}
Diffstat (limited to 'ui')
91 files changed, 98 insertions, 98 deletions
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc index a96c94d..a7b5b44 100644 --- a/ui/aura/window_tree_host.cc +++ b/ui/aura/window_tree_host.cc @@ -21,8 +21,8 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" namespace aura { diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 4f53320..9d9c754 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -40,9 +40,9 @@ #include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/test/event_generator.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" -#include "ui/gfx/vector2d.h" DECLARE_WINDOW_PROPERTY_TYPE(const char*) DECLARE_WINDOW_PROPERTY_TYPE(int) diff --git a/ui/base/clipboard/clipboard.cc b/ui/base/clipboard/clipboard.cc index aedc54b..d7b71f8 100644 --- a/ui/base/clipboard/clipboard.cc +++ b/ui/base/clipboard/clipboard.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc index c197d85..d4a6548 100644 --- a/ui/base/clipboard/clipboard_android.cc +++ b/ui/base/clipboard/clipboard_android.cc @@ -11,7 +11,7 @@ #include "base/synchronization/lock.h" #include "jni/Clipboard_jni.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" // TODO:(andrewhayden) Support additional formats in Android: Bitmap, URI, HTML, // HTML+text now that Android's clipboard system supports them, then nuke the diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc index 5952d6c..e682392 100644 --- a/ui/base/clipboard/clipboard_aura.cc +++ b/ui/base/clipboard/clipboard_aura.cc @@ -14,7 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/custom_data_helper.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 617e38021..de56858 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -28,7 +28,7 @@ #include "ui/events/platform/platform_event_observer.h" #include "ui/events/platform/platform_event_source.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/x/x11_atom_cache.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index 2b56f8c..e42a49f 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -21,8 +21,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" -#include "ui/gfx/size.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h index 2c5827f..9d51921 100644 --- a/ui/base/clipboard/clipboard_test_template.h +++ b/ui/base/clipboard/clipboard_test_template.h @@ -32,7 +32,7 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/test/test_clipboard.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_WIN) #include "ui/base/clipboard/clipboard_util_win.h" diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index 38d02f8..7998431 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -29,7 +29,7 @@ #include "ui/base/clipboard/clipboard_util_win.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace ui { diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc index 599b565..5044f62 100644 --- a/ui/base/clipboard/scoped_clipboard_writer.cc +++ b/ui/base/clipboard/scoped_clipboard_writer.cc @@ -11,7 +11,7 @@ #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace ui { diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc index 7769fe0..8ad1f0e 100644 --- a/ui/base/cursor/cursor_loader_x11.cc +++ b/ui/base/cursor/cursor_loader_x11.cc @@ -14,8 +14,8 @@ #include "ui/base/cursor/cursor_util.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image.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 6e2102b..ff45bf0 100644 --- a/ui/base/cursor/cursor_util.cc +++ b/ui/base/cursor/cursor_util.cc @@ -8,8 +8,8 @@ #include "skia/ext/image_operations.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" diff --git a/ui/base/dragdrop/drag_utils_aura.cc b/ui/base/dragdrop/drag_utils_aura.cc index e202e81..097978c 100644 --- a/ui/base/dragdrop/drag_utils_aura.cc +++ b/ui/base/dragdrop/drag_utils_aura.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" -#include "ui/gfx/vector2d.h" namespace drag_utils { diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h index 88218a2..0f9163b 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h @@ -10,8 +10,8 @@ #include "base/files/file_path.h" #include "base/pickle.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/vector2d.h" #include "url/gurl.h" namespace ui { diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h index 08c93e0..4d6a95f 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h +++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h @@ -19,8 +19,8 @@ #include "ui/base/x/selection_requestor.h" #include "ui/base/x/selection_utils.h" #include "ui/events/platform/platform_event_dispatcher.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/vector2d.h" #include "ui/gfx/x/x11_atom_cache.h" #include "url/gurl.h" diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h index 4e8683b..4065bcb 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.h +++ b/ui/base/dragdrop/os_exchange_data_provider_win.h @@ -22,8 +22,8 @@ #include "base/win/scoped_comptr.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/ui_base_export.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/vector2d.h" namespace ui { diff --git a/ui/base/l10n/l10n_font_util.h b/ui/base/l10n/l10n_font_util.h index b27b3f6..8036566 100644 --- a/ui/base/l10n/l10n_font_util.h +++ b/ui/base/l10n/l10n_font_util.h @@ -6,7 +6,7 @@ #define UI_BASE_L10N_FONT_UTIL_H_ #include "ui/base/ui_base_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { class Font; diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 0379b05..c099860 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -30,10 +30,10 @@ #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/geometry/safe_integer_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/strings/grit/app_locale_settings.h" #if defined(OS_ANDROID) diff --git a/ui/chromeos/network/network_icon.cc b/ui/chromeos/network/network_icon.cc index 06af4b3..ca06e2c 100644 --- a/ui/chromeos/network/network_icon.cc +++ b/ui/chromeos/network/network_icon.cc @@ -20,9 +20,9 @@ #include "ui/chromeos/network/network_icon_animation_observer.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size_conversions.h" using chromeos::DeviceState; using chromeos::NetworkConnectionHandler; diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 249ff7c..94cd1a91 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -21,9 +21,9 @@ #include "ui/compositor/compositor_export.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/layer_animator_collection.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" -#include "ui/gfx/vector2d.h" class SkBitmap; diff --git a/ui/compositor/dip_util.cc b/ui/compositor/dip_util.cc index d2c540e..ae418f0 100644 --- a/ui/compositor/dip_util.cc +++ b/ui/compositor/dip_util.cc @@ -15,8 +15,8 @@ #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_conversions.h" #if DCHECK_IS_ON #include "ui/compositor/layer_animator.h" diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index f88ad811..947cf62 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -33,8 +33,8 @@ #include "ui/gfx/display.h" #include "ui/gfx/geometry/point3_f.h" #include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/interpolated_transform.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 a028596..fcc8cc9 100644 --- a/ui/events/cocoa/events_mac.mm +++ b/ui/events/cocoa/events_mac.mm @@ -15,7 +15,7 @@ #include "ui/events/event_utils.h" #import "ui/events/keycodes/keyboard_code_conversion_mac.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace ui { diff --git a/ui/events/events_stub.cc b/ui/events/events_stub.cc index 090f84b..05b4b7f 100644 --- a/ui/events/events_stub.cc +++ b/ui/events/events_stub.cc @@ -8,7 +8,7 @@ #include "ui/events/event_utils.h" #include "ui/events/keycodes/dom3/dom_code.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace ui { diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc index f818cfe..37da9d9 100644 --- a/ui/gfx/android/java_bitmap.cc +++ b/ui/gfx/android/java_bitmap.cc @@ -9,7 +9,7 @@ #include "base/android/jni_string.h" #include "base/logging.h" #include "jni/BitmapHelper_jni.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; diff --git a/ui/gfx/android/java_bitmap.h b/ui/gfx/android/java_bitmap.h index 1db6c4b..31db157 100644 --- a/ui/gfx/android/java_bitmap.h +++ b/ui/gfx/android/java_bitmap.h @@ -9,7 +9,7 @@ #include "base/android/scoped_java_ref.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc index a4b15ad..065c51e 100644 --- a/ui/gfx/blit.cc +++ b/ui/gfx/blit.cc @@ -9,7 +9,7 @@ #include "skia/ext/platform_canvas.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" #if defined(USE_CAIRO) #if defined(OS_OPENBSD) diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc index a0f5760..bcf6256 100644 --- a/ui/gfx/canvas.cc +++ b/ui/gfx/canvas.cc @@ -15,8 +15,8 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/safe_integer_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/scoped_canvas.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/transform.h" diff --git a/ui/gfx/canvas_paint_mac.mm b/ui/gfx/canvas_paint_mac.mm index 8ba697d..4cb2da0 100644 --- a/ui/gfx/canvas_paint_mac.mm +++ b/ui/gfx/canvas_paint_mac.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "ui/gfx/canvas_paint_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { diff --git a/ui/gfx/canvas_paint_win.h b/ui/gfx/canvas_paint_win.h index 9028cba..a1349eb 100644 --- a/ui/gfx/canvas_paint_win.h +++ b/ui/gfx/canvas_paint_win.h @@ -7,7 +7,7 @@ #include "skia/ext/platform_canvas.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/win/dpi.h" namespace gfx { diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc index 068a193..ea82f13 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc @@ -11,7 +11,7 @@ #include "third_party/skia/include/core/SkColorPriv.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" #include "third_party/zlib/zlib.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" namespace gfx { diff --git a/ui/gfx/codec/png_codec_unittest.cc b/ui/gfx/codec/png_codec_unittest.cc index 6613a63..610421a 100644 --- a/ui/gfx/codec/png_codec_unittest.cc +++ b/ui/gfx/codec/png_codec_unittest.cc @@ -13,7 +13,7 @@ #include "third_party/skia/include/core/SkUnPreMultiply.h" #include "third_party/zlib/zlib.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" namespace gfx { diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc index e5eb074..c79dcea 100644 --- a/ui/gfx/display.cc +++ b/ui/gfx/display.cc @@ -13,7 +13,7 @@ #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/geometry/size_conversions.h" #include "ui/gfx/switches.h" namespace gfx { diff --git a/ui/gfx/geometry/dip_util.cc b/ui/gfx/geometry/dip_util.cc index 5112de6..702d6d3 100644 --- a/ui/gfx/geometry/dip_util.cc +++ b/ui/gfx/geometry/dip_util.cc @@ -9,8 +9,8 @@ #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_conversions.h" namespace gfx { diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index 6168f21..8a9c0eb 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -15,9 +15,9 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/gdi_util.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_family.h" -#include "ui/gfx/size.h" namespace { diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h index 295b949..2e1c080 100644 --- a/ui/gfx/icon_util.h +++ b/ui/gfx/icon_util.h @@ -13,8 +13,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/size.h" namespace base { class FilePath; diff --git a/ui/gfx/icon_util_unittest.cc b/ui/gfx/icon_util_unittest.cc index 280c25f..d58cca4 100644 --- a/ui/gfx/icon_util_unittest.cc +++ b/ui/gfx/icon_util_unittest.cc @@ -10,11 +10,11 @@ #include "base/path_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/icon_util_unittests_resource.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_family.h" -#include "ui/gfx/size.h" namespace { diff --git a/ui/gfx/image/canvas_image_source.h b/ui/gfx/image/canvas_image_source.h index 8c1a87d..ef9422a 100644 --- a/ui/gfx/image/canvas_image_source.h +++ b/ui/gfx/image/canvas_image_source.h @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_export.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" namespace gfx { class Canvas; diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 5f0d1dc..46c1a44 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_png_rep.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" #if !defined(OS_IOS) #include "ui/gfx/codec/png_codec.h" diff --git a/ui/gfx/image/image_family.cc b/ui/gfx/image/image_family.cc index 6719bc1..04f516b 100644 --- a/ui/gfx/image/image_family.cc +++ b/ui/gfx/image/image_family.cc @@ -6,9 +6,9 @@ #include <cmath> +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" namespace gfx { diff --git a/ui/gfx/image/image_ios.mm b/ui/gfx/image/image_ios.mm index 126bfb4..9448b2e 100644 --- a/ui/gfx/image/image_ios.mm +++ b/ui/gfx/image/image_ios.mm @@ -11,10 +11,10 @@ #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsobject.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_png_rep.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_util_ios.h" -#include "ui/gfx/size.h" namespace gfx { namespace internal { diff --git a/ui/gfx/image/image_mac.mm b/ui/gfx/image/image_mac.mm index 15a5610..6c9e621 100644 --- a/ui/gfx/image/image_mac.mm +++ b/ui/gfx/image/image_mac.mm @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_png_rep.h" -#include "ui/gfx/size.h" namespace gfx { namespace internal { diff --git a/ui/gfx/image/image_png_rep.cc b/ui/gfx/image/image_png_rep.cc index 3970d2b..78b496f 100644 --- a/ui/gfx/image/image_png_rep.cc +++ b/ui/gfx/image/image_png_rep.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc index 0fa475d..5e4410a 100644 --- a/ui/gfx/image/image_skia.cc +++ b/ui/gfx/image/image_skia.cc @@ -13,10 +13,10 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/switches.h" diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc index 9398227..2c44d1a 100644 --- a/ui/gfx/image/image_skia_operations.cc +++ b/ui/gfx/image/image_skia_operations.cc @@ -13,12 +13,12 @@ #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_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/size.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" diff --git a/ui/gfx/image/image_skia_rep.h b/ui/gfx/image/image_skia_rep.h index 47f6713..acf9919 100644 --- a/ui/gfx/image/image_skia_rep.h +++ b/ui/gfx/image/image_skia_rep.h @@ -6,8 +6,8 @@ #define UI_GFX_IMAGE_IMAGE_SKIA_REP_H_ #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/size.h" namespace gfx { diff --git a/ui/gfx/image/image_skia_unittest.cc b/ui/gfx/image/image_skia_unittest.cc index a5ce86e..49348e2 100644 --- a/ui/gfx/image/image_skia_unittest.cc +++ b/ui/gfx/image/image_skia_unittest.cc @@ -9,9 +9,9 @@ #include "base/threading/simple_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" #include "ui/gfx/switches.h" // Duplicated from base/threading/non_thread_safe.h so that we can be diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h index ff6e278..8f6fa27 100644 --- a/ui/gfx/render_text.h +++ b/ui/gfx/render_text.h @@ -23,12 +23,12 @@ #include "ui/gfx/font_render_params.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size_f.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/range/range.h" #include "ui/gfx/selection_model.h" #include "ui/gfx/shadow_value.h" -#include "ui/gfx/size_f.h" #include "ui/gfx/text_constants.h" -#include "ui/gfx/vector2d.h" class SkCanvas; class SkDrawLooper; diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc index d48b0b1..1f2f5f8 100644 --- a/ui/gfx/screen_android.cc +++ b/ui/gfx/screen_android.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "ui/gfx/android/device_display_info.h" #include "ui/gfx/display.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace gfx { diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc index 76e0c8d..76aa763 100644 --- a/ui/gfx/skbitmap_operations.cc +++ b/ui/gfx/skbitmap_operations.cc @@ -17,7 +17,7 @@ #include "third_party/skia/include/effects/SkBlurImageFilter.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" // static SkBitmap SkBitmapOperations::CreateInvertedBitmap(const SkBitmap& image) { diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc index a28b6b7..ceaaefd 100644 --- a/ui/gfx/win/dpi.cc +++ b/ui/gfx/win/dpi.cc @@ -9,7 +9,7 @@ #include "ui/gfx/display.h" #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace { diff --git a/ui/gfx/win/dpi.h b/ui/gfx/win/dpi.h index 2aadeb91..17f69b3 100644 --- a/ui/gfx/win/dpi.h +++ b/ui/gfx/win/dpi.h @@ -7,8 +7,8 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_export.h" -#include "ui/gfx/size.h" namespace gfx { diff --git a/ui/gfx/win/hwnd_util.cc b/ui/gfx/win/hwnd_util.cc index 2be0d00..1d23d96 100644 --- a/ui/gfx/win/hwnd_util.cc +++ b/ui/gfx/win/hwnd_util.cc @@ -11,7 +11,7 @@ #include "base/win/win_util.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { diff --git a/ui/gl/gl_context_osmesa.cc b/ui/gl/gl_context_osmesa.cc index d41a493..f08189c 100644 --- a/ui/gl/gl_context_osmesa.cc +++ b/ui/gl/gl_context_osmesa.cc @@ -7,7 +7,7 @@ #include <GL/osmesa.h> #include "base/logging.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_surface.h" diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h index 45b8f216..2142413 100644 --- a/ui/gl/gl_image.h +++ b/ui/gl/gl_image.h @@ -8,9 +8,9 @@ #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/overlay_transform.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_export.h" namespace gfx { diff --git a/ui/gl/gl_image_glx.h b/ui/gl/gl_image_glx.h index f6031e2..1f4e819 100644 --- a/ui/gl/gl_image_glx.h +++ b/ui/gl/gl_image_glx.h @@ -5,7 +5,7 @@ #ifndef UI_GL_GL_IMAGE_GLX_H_ #define UI_GL_GL_IMAGE_GLX_H_ -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/x/x11_types.h" #include "ui/gl/gl_export.h" #include "ui/gl/gl_image.h" diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h index 3220be6..a6e6ff1 100644 --- a/ui/gl/gl_surface.h +++ b/ui/gl/gl_surface.h @@ -12,9 +12,9 @@ #include "build/build_config.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/overlay_transform.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_export.h" #include "ui/gl/gl_implementation.h" diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index 767ed7b..b05f9bf 100644 --- a/ui/gl/gl_surface_egl.h +++ b/ui/gl/gl_surface_egl.h @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "base/time/time.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/vsync_provider.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_surface.h" diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h index 631d054..c1fca60 100644 --- a/ui/gl/gl_surface_glx.h +++ b/ui/gl/gl_surface_glx.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "ui/events/platform/platform_event_dispatcher.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gfx/vsync_provider.h" #include "ui/gfx/x/x11_types.h" #include "ui/gl/gl_export.h" diff --git a/ui/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h index 80d1087..cd65e65 100644 --- a/ui/gl/gl_surface_osmesa.h +++ b/ui/gl/gl_surface_osmesa.h @@ -6,7 +6,7 @@ #define UI_GL_GL_SURFACE_OSMESA_H_ #include "base/memory/scoped_ptr.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_surface.h" namespace gfx { diff --git a/ui/message_center/message_center_impl_unittest.cc b/ui/message_center/message_center_impl_unittest.cc index 6f657e9..b056d8e 100644 --- a/ui/message_center/message_center_impl_unittest.cc +++ b/ui/message_center/message_center_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_types.h" #include "ui/message_center/notification_blocker.h" diff --git a/ui/message_center/message_center_style.h b/ui/message_center/message_center_style.h index b6e415e..cfdc05a 100644 --- a/ui/message_center/message_center_style.h +++ b/ui/message_center/message_center_style.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/message_center/message_center_export.h" namespace message_center { diff --git a/ui/message_center/views/constants.h b/ui/message_center/views/constants.h index f2995dd4..5bd55a4 100644 --- a/ui/message_center/views/constants.h +++ b/ui/message_center/views/constants.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/message_center/message_center_style.h" namespace message_center { diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc index fd0784a..8319d05 100644 --- a/ui/message_center/views/message_center_view.cc +++ b/ui/message_center/views/message_center_view.cc @@ -17,7 +17,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/message_center_switches.h" diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc index 1cc9c2b..5f314b5 100644 --- a/ui/message_center/views/notification_view.cc +++ b/ui/message_center/views/notification_view.cc @@ -11,7 +11,7 @@ #include "ui/base/cursor/cursor.h" #include "ui/base/layout.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/text_elider.h" #include "ui/message_center/message_center.h" diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index 856546b..523545f 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -16,8 +16,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/views/message_center_view.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/message_center/views/toast_contents_view.h b/ui/message_center/views/toast_contents_view.h index 08196e6..87d9229 100644 --- a/ui/message_center/views/toast_contents_view.h +++ b/ui/message_center/views/toast_contents_view.h @@ -10,8 +10,8 @@ #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/message_center/views/message_center_controller.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index 0a9606e..fc8a906 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc @@ -11,10 +11,10 @@ #include "ui/base/nine_image_painter_factory.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/nine_image_painter.h" #include "ui/gfx/path.h" -#include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/common_theme.h" diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc index a4d5de5..dcf742c 100644 --- a/ui/native_theme/native_theme_base.cc +++ b/ui/native_theme/native_theme_base.cc @@ -16,8 +16,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/common_theme.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/native_theme/native_theme_win.h b/ui/native_theme/native_theme_win.h index 78f4740..24b718f 100644 --- a/ui/native_theme/native_theme_win.h +++ b/ui/native_theme/native_theme_win.h @@ -19,7 +19,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/sys_color_change_listener.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 3172618..a720dc9 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -19,9 +19,9 @@ #include "ui/compositor/test/draw_waiter_for_test.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/transform.h" #include "ui/gl/gl_implementation.h" #include "ui/wm/core/default_activation_client.h" diff --git a/ui/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h index 045c3ee..4191d36 100644 --- a/ui/surface/accelerated_surface_mac.h +++ b/ui/surface/accelerated_surface_mac.h @@ -12,7 +12,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gpu_preference.h" diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc index f295173..05a81a7 100644 --- a/ui/views/controls/button/label_button_unittest.cc +++ b/ui/views/controls/button/label_button_unittest.cc @@ -8,7 +8,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/text_utils.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index cd6f5d3..9274e55 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -14,9 +14,9 @@ #include "ui/events/event_utils.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/screen.h" -#include "ui/gfx/vector2d.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/menu_config.h" diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc index 6247ace..fa7c660 100644 --- a/ui/views/controls/menu/menu_image_util.cc +++ b/ui/views/controls/menu/menu_image_util.cc @@ -10,11 +10,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.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/size.h" #include "ui/resources/grit/ui_resources.h" namespace { diff --git a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h index 1ae2133..8d0aa94 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_THUMB_H_ #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_THUMB_H_ -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/scrollbar/scroll_bar.h" #include "ui/views/view.h" diff --git a/ui/views/controls/styled_label.h b/ui/views/controls/styled_label.h index f67ca23..adbd7a9 100644 --- a/ui/views/controls/styled_label.h +++ b/ui/views/controls/styled_label.h @@ -12,8 +12,8 @@ #include "base/strings/string16.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font_list.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/range/range.h" -#include "ui/gfx/size.h" #include "ui/views/controls/link_listener.h" #include "ui/views/view.h" diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h index a910906..3640184 100644 --- a/ui/views/controls/webview/web_dialog_view.h +++ b/ui/views/controls/webview/web_dialog_view.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/controls/webview/webview_export.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/client_view.h" diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc index 0fd5e5e..2597bf2 100644 --- a/ui/views/drag_utils.cc +++ b/ui/views/drag_utils.cc @@ -6,8 +6,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/views/widget/widget.h" namespace { diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index f642f0a..3ed8c0b 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -11,10 +11,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/resources/grit/ui_resources.h" #include "ui/strings/grit/ui_strings.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/view.h b/ui/views/view.h index 59dba48..474ae01 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -29,8 +29,8 @@ #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/r_tree.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/vector2d.h" #include "ui/views/cull_set.h" #include "ui/views/view_targeter.h" #include "ui/views/views_export.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 79b9842..88c6090 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -21,8 +21,8 @@ #include "ui/gfx/display.h" #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/native_theme/native_theme.h" #include "ui/views/corewm/tooltip.h" #include "ui/views/corewm/tooltip_controller.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 7306a1c..15219ca 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 @@ -17,10 +17,10 @@ #include "ui/base/win/shell.h" #include "ui/compositor/compositor_constants.h" #include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/path.h" #include "ui/gfx/path_win.h" -#include "ui/gfx/vector2d.h" #include "ui/gfx/win/dpi.h" #include "ui/native_theme/native_theme_aura.h" #include "ui/native_theme/native_theme_win.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 69080a9..d6b5cc8 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 @@ -18,7 +18,7 @@ #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/x/x11_atom_cache.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" diff --git a/ui/views/window/window_shape.cc b/ui/views/window/window_shape.cc index 1f6bc13..39fe3de 100644 --- a/ui/views/window/window_shape.cc +++ b/ui/views/window/window_shape.cc @@ -4,8 +4,8 @@ #include "ui/views/window/window_shape.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/path.h" -#include "ui/gfx/size.h" namespace views { diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/ui/web_dialogs/test/test_web_dialog_delegate.h index c753a71..79f6f23 100644 --- a/ui/web_dialogs/test/test_web_dialog_delegate.h +++ b/ui/web_dialogs/test/test_web_dialog_delegate.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" #include "url/gurl.h" diff --git a/ui/wm/core/image_grid.cc b/ui/wm/core/image_grid.cc index 8441965..3f90efe 100644 --- a/ui/wm/core/image_grid.cc +++ b/ui/wm/core/image_grid.cc @@ -12,10 +12,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/transform.h" using std::max; diff --git a/ui/wm/core/image_grid.h b/ui/wm/core/image_grid.h index cc622ad..f58ffbb 100644 --- a/ui/wm/core/image_grid.h +++ b/ui/wm/core/image_grid.h @@ -11,8 +11,8 @@ #include "ui/compositor/layer.h" #include "ui/compositor/layer_delegate.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" #include "ui/wm/wm_export.h" namespace gfx { diff --git a/ui/wm/core/window_animations.cc b/ui/wm/core/window_animations.cc index 574f56b3..0aa3caa 100644 --- a/ui/wm/core/window_animations.cc +++ b/ui/wm/core/window_animations.cc @@ -30,10 +30,10 @@ #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/animation/animation.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/geometry/vector3d_f.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" -#include "ui/gfx/vector2d.h" #include "ui/wm/core/window_util.h" #include "ui/wm/core/wm_core_switches.h" #include "ui/wm/public/animation_host.h" diff --git a/ui/wm/core/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc index 095ea02..2739fd0 100644 --- a/ui/wm/core/window_animations_unittest.cc +++ b/ui/wm/core/window_animations_unittest.cc @@ -12,7 +12,7 @@ #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/gfx/animation/animation_container_element.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/wm/core/transient_window_manager.h" #include "ui/wm/core/transient_window_stacking_client.h" #include "ui/wm/core/window_util.h" diff --git a/ui/wm/public/window_move_client.h b/ui/wm/public/window_move_client.h index b8943d3..fbfa92d 100644 --- a/ui/wm/public/window_move_client.h +++ b/ui/wm/public/window_move_client.h @@ -6,7 +6,7 @@ #define UI_WM_PUBLIC_WINDOW_MOVE_CLIENT_H_ #include "ui/aura/aura_export.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace gfx { class Point; |