diff options
359 files changed, 379 insertions, 380 deletions
diff --git a/cc/layers/surface_layer.h b/cc/layers/surface_layer.h index 9b73589..381369f 100644 --- a/cc/layers/surface_layer.h +++ b/cc/layers/surface_layer.h @@ -9,7 +9,7 @@ #include "cc/layers/layer.h" #include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_sequence.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/chrome/browser/android/compositor/decoration_title.h b/chrome/browser/android/compositor/decoration_title.h index 22e4931..f5c46e9 100644 --- a/chrome/browser/android/compositor/decoration_title.h +++ b/chrome/browser/android/compositor/decoration_title.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "cc/resources/ui_resource_client.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/chrome/browser/android/compositor/layer/content_layer.cc b/chrome/browser/android/compositor/layer/content_layer.cc index d64a306..179e757 100644 --- a/chrome/browser/android/compositor/layer/content_layer.cc +++ b/chrome/browser/android/compositor/layer/content_layer.cc @@ -8,7 +8,7 @@ #include "cc/layers/layer_lists.h" #include "chrome/browser/android/compositor/layer/thumbnail_layer.h" #include "chrome/browser/android/compositor/tab_content_manager.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chrome { namespace android { diff --git a/chrome/browser/android/compositor/layer/content_layer.h b/chrome/browser/android/compositor/layer/content_layer.h index b18b0cc..c262d25 100644 --- a/chrome/browser/android/compositor/layer/content_layer.h +++ b/chrome/browser/android/compositor/layer/content_layer.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/android/compositor/layer/layer.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { class Layer; diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc index 24ea3b8..a0af759 100644 --- a/chrome/browser/android/compositor/layer/tab_layer.cc +++ b/chrome/browser/android/compositor/layer/tab_layer.cc @@ -20,10 +20,10 @@ #include "ui/android/resources/ui_resource_android.h" #include "ui/base/l10n/l10n_util_android.h" #include "ui/gfx/geometry/insets_f.h" +#include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/safe_integer_conversions.h" -#include "ui/gfx/point_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" namespace chrome { diff --git a/chrome/browser/android/compositor/layer_title_cache.cc b/chrome/browser/android/compositor/layer_title_cache.cc index 05cdb6b..3db241b 100644 --- a/chrome/browser/android/compositor/layer_title_cache.cc +++ b/chrome/browser/android/compositor/layer_title_cache.cc @@ -13,9 +13,9 @@ #include "jni/LayerTitleCache_jni.h" #include "ui/android/resources/resource_manager.h" #include "ui/gfx/android/java_bitmap.h" +#include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect_f.h" -#include "ui/gfx/point_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chrome { namespace android { diff --git a/chrome/browser/android/compositor/layer_title_cache.h b/chrome/browser/android/compositor/layer_title_cache.h index ddc2e4c..14c150d 100644 --- a/chrome/browser/android/compositor/layer_title_cache.h +++ b/chrome/browser/android/compositor/layer_title_cache.h @@ -13,7 +13,7 @@ #include "base/id_map.h" #include "cc/resources/ui_resource_client.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc index f77797d..9a8db76 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc @@ -17,7 +17,7 @@ #include "testing/gtest/include/gtest/gtest.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" #include "ui/gfx/skia_util.h" const bool kAsyncCall = true; diff --git a/chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc b/chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc index 2da92f8..516f87b 100644 --- a/chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc +++ b/chrome/browser/chromeos/app_mode/certificate_manager_dialog.cc @@ -13,7 +13,7 @@ #include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/controls/webview/web_dialog_view.h" namespace { diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc index 58afcf4..4943dd1 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc +++ b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc @@ -11,7 +11,7 @@ #include "chrome/grit/generated_resources.h" #include "device/bluetooth/bluetooth_device.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/chromeos/first_run/step.cc b/chrome/browser/chromeos/first_run/step.cc index b5432ee..7753074 100644 --- a/chrome/browser/chromeos/first_run/step.cc +++ b/chrome/browser/chromeos/first_run/step.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/widget/widget.h" namespace { diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc index 481d435..41393a7 100644 --- a/chrome/browser/chromeos/first_run/steps/tray_step.cc +++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chromeos/first_run/step_names.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chromeos { namespace first_run { diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc index d57ebad..4a046c7 100644 --- a/chrome/browser/chromeos/login/help_app_launcher.cc +++ b/chrome/browser/chromeos/login/help_app_launcher.cc @@ -16,7 +16,7 @@ #include "extensions/browser/extension_registry.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::BrowserThread; using extensions::ExtensionRegistry; diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc index 5e6d719..a7e6018 100644 --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc @@ -77,8 +77,8 @@ #include "ui/events/event_utils.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/gfx/transform.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h" diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog.cc b/chrome/browser/chromeos/login/ui/login_web_dialog.cc index 0aee01e..9e1a215 100644 --- a/chrome/browser/chromeos/login/ui/login_web_dialog.cc +++ b/chrome/browser/chromeos/login/ui/login_web_dialog.cc @@ -15,8 +15,8 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.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/views/widget/widget.h" using content::WebContents; diff --git a/chrome/browser/chromeos/login/ui/login_web_dialog.h b/chrome/browser/chromeos/login/ui/login_web_dialog.h index c9d38cd..a4437b1 100644 --- a/chrome/browser/chromeos/login/ui/login_web_dialog.h +++ b/chrome/browser/chromeos/login/ui/login_web_dialog.h @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc index 42b74cb..21aae25 100644 --- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc +++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc @@ -19,7 +19,7 @@ #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen.cc b/chrome/browser/chromeos/login/ui/user_adding_screen.cc index fed01bc..0aad3e8 100644 --- a/chrome/browser/chromeos/login/ui/user_adding_screen.cc +++ b/chrome/browser/chromeos/login/ui/user_adding_screen.cc @@ -14,7 +14,7 @@ #include "components/session_manager/core/session_manager.h" #include "components/user_manager/user_manager.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if !defined(USE_ATHENA) #include "ash/shell.h" diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc index f932926..dc1c39f 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc @@ -42,7 +42,7 @@ #include "content/public/common/renderer_preferences.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/chromeos/net/network_portal_web_dialog.cc b/chrome/browser/chromeos/net/network_portal_web_dialog.cc index 28a611a..fd14550 100644 --- a/chrome/browser/chromeos/net/network_portal_web_dialog.cc +++ b/chrome/browser/chromeos/net/network_portal_web_dialog.cc @@ -10,7 +10,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/display.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/widget/widget.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc index 5217006..a8bfa6ee7 100644 --- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc +++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc @@ -13,7 +13,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/text_constants.h" #include "ui/views/border.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/chromeos/set_time_dialog.cc b/chrome/browser/chromeos/set_time_dialog.cc index ca43412..d561f34 100644 --- a/chrome/browser/chromeos/set_time_dialog.cc +++ b/chrome/browser/chromeos/set_time_dialog.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/chromeos/sim_dialog_delegate.cc b/chrome/browser/chromeos/sim_dialog_delegate.cc index 7e49665..4321b1c 100644 --- a/chrome/browser/chromeos/sim_dialog_delegate.cc +++ b/chrome/browser/chromeos/sim_dialog_delegate.cc @@ -8,7 +8,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/url_constants.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc index ad5acc3..43e4b5c 100644 --- a/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc +++ b/chrome/browser/chromeos/ui/choose_mobile_network_dialog.cc @@ -7,7 +7,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/url_constants.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/devtools/device/android_device_manager.h b/chrome/browser/devtools/device/android_device_manager.h index 47fcf65..b70befc 100644 --- a/chrome/browser/devtools/device/android_device_manager.h +++ b/chrome/browser/devtools/device/android_device_manager.h @@ -12,7 +12,7 @@ #include "base/threading/non_thread_safe.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace net { class StreamSocket; diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h index 32c8413..446297d 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.h +++ b/chrome/browser/devtools/device/devtools_android_bridge.h @@ -18,7 +18,7 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/devtools_agent_host.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" template<typename T> struct DefaultSingletonTraits; diff --git a/chrome/browser/devtools/devtools_contents_resizing_strategy.h b/chrome/browser/devtools/devtools_contents_resizing_strategy.h index 09cf58a..8814337 100644 --- a/chrome/browser/devtools/devtools_contents_resizing_strategy.h +++ b/chrome/browser/devtools/devtools_contents_resizing_strategy.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" // This class knows how to resize both DevTools and inspected WebContents // inside a browser window hierarchy. diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h index 0cf0abe..f9998c0 100644 --- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h +++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class ListValue; diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h index d013596..97c9fe2 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.h +++ b/chrome/browser/devtools/devtools_ui_bindings.h @@ -21,7 +21,7 @@ #include "content/public/browser/devtools_frontend_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class InfoBarService; class Profile; diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 2dd0451..512de3b 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -32,9 +32,9 @@ #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" using content::WebContents; diff --git a/chrome/browser/extensions/display_info_provider_win.cc b/chrome/browser/extensions/display_info_provider_win.cc index 02609f9..7d04411 100644 --- a/chrome/browser/extensions/display_info_provider_win.cc +++ b/chrome/browser/extensions/display_info_provider_win.cc @@ -11,8 +11,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/win/win_util.h" #include "extensions/common/api/system_display.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/gfx/win/dpi.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index 823ccff..1ebf4de 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -26,11 +26,11 @@ #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.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 5b1e197..adba0e8 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -45,9 +45,9 @@ #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" -#include "ui/gfx/size.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index a1e62e2..a15b179 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -19,8 +19,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/extensions/favicon_downloader.cc b/chrome/browser/extensions/favicon_downloader.cc index 4237eb7..bc93869 100644 --- a/chrome/browser/extensions/favicon_downloader.cc +++ b/chrome/browser/extensions/favicon_downloader.cc @@ -9,7 +9,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/favicon_url.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" FaviconDownloader::FaviconDownloader( content::WebContents* web_contents, diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index 1368dff..fce11d5 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -11,9 +11,9 @@ #include "base/message_loop/message_loop.h" #include "base/threading/thread.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/icon_util.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" #include "ui/gfx/win/dpi.h" // static diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index ad8cccb..05869d9 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -21,7 +21,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/referrer.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class Profile; diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc index 8120577..f9aa403 100644 --- a/chrome/browser/prerender/prerender_link_manager.cc +++ b/chrome/browser/prerender/prerender_link_manager.cc @@ -24,7 +24,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/session_storage_namespace.h" #include "content/public/common/referrer.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" #if defined(ENABLE_EXTENSIONS) diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index 6f3718d..ea4a53d 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -27,7 +27,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" using base::Time; 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 c6ed15b9..6d8bb6d 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -98,7 +98,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/text_elider.h" #if defined(ENABLE_PRINTING) diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index b1c07b3..c15ba8c 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -26,12 +26,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/geometry/size_conversions.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_operations.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/resources/grit/ui_resources.h" diff --git a/chrome/browser/thumbnails/content_analysis.h b/chrome/browser/thumbnails/content_analysis.h index 85fc735..6653152 100644 --- a/chrome/browser/thumbnails/content_analysis.h +++ b/chrome/browser/thumbnails/content_analysis.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/chrome/browser/thumbnails/content_analysis_unittest.cc b/chrome/browser/thumbnails/content_analysis_unittest.cc index 6a9bb65..b1663cf 100644 --- a/chrome/browser/thumbnails/content_analysis_unittest.cc +++ b/chrome/browser/thumbnails/content_analysis_unittest.cc @@ -20,8 +20,8 @@ #include "ui/gfx/color_analysis.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" namespace { diff --git a/chrome/browser/thumbnails/content_based_thumbnailing_algorithm.cc b/chrome/browser/thumbnails/content_based_thumbnailing_algorithm.cc index 92b83e6..6bb8883 100644 --- a/chrome/browser/thumbnails/content_based_thumbnailing_algorithm.cc +++ b/chrome/browser/thumbnails/content_based_thumbnailing_algorithm.cc @@ -11,8 +11,8 @@ #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/color_utils.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/scrollbar_size.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/thumbnails/simple_thumbnail_crop.cc b/chrome/browser/thumbnails/simple_thumbnail_crop.cc index b438536..b426325 100644 --- a/chrome/browser/thumbnails/simple_thumbnail_crop.cc +++ b/chrome/browser/thumbnails/simple_thumbnail_crop.cc @@ -8,10 +8,10 @@ #include "content/public/browser/browser_thread.h" #include "skia/ext/platform_canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/screen.h" #include "ui/gfx/scrollbar_size.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/thumbnails/thumbnail_tab_helper.cc index e28c9dc..63d626a 100644 --- a/chrome/browser/thumbnails/thumbnail_tab_helper.cc +++ b/chrome/browser/thumbnails/thumbnail_tab_helper.cc @@ -17,7 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "ui/gfx/color_utils.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/screen.h" #include "ui/gfx/scrollbar_size.h" #include "ui/gfx/skbitmap_operations.h" diff --git a/chrome/browser/thumbnails/thumbnailing_algorithm.h b/chrome/browser/thumbnails/thumbnailing_algorithm.h index 3701845..f75ab7c 100644 --- a/chrome/browser/thumbnails/thumbnailing_algorithm.h +++ b/chrome/browser/thumbnails/thumbnailing_algorithm.h @@ -9,7 +9,7 @@ #include "chrome/browser/thumbnails/thumbnailing_context.h" #include "ui/base/layout.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/chrome/browser/thumbnails/thumbnailing_context.h b/chrome/browser/thumbnails/thumbnailing_context.h index 9add880..1cfe671 100644 --- a/chrome/browser/thumbnails/thumbnailing_context.h +++ b/chrome/browser/thumbnails/thumbnailing_context.h @@ -10,7 +10,7 @@ #include "chrome/browser/thumbnails/thumbnail_service.h" #include "components/history/core/common/thumbnail_score.h" #include "content/public/browser/web_contents.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace thumbnails { diff --git a/chrome/browser/ui/app_list/app_list_positioner.h b/chrome/browser/ui/app_list/app_list_positioner.h index 43b6cbbe..8e8c787 100644 --- a/chrome/browser/ui/app_list/app_list_positioner.h +++ b/chrome/browser/ui/app_list/app_list_positioner.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_POSITIONER_H_ #include "ui/gfx/display.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { class Point; 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 0b78251..7d4e592 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 @@ -8,7 +8,7 @@ #include "ui/gfx/display.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 { diff --git a/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h b/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h index 9c9b465..cd4b637 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h +++ b/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace autofill { diff --git a/chrome/browser/ui/autofill/autofill_dialog_view_tester.h b/chrome/browser/ui/autofill/autofill_dialog_view_tester.h index 2ac58da..b2024d1 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_view_tester.h +++ b/chrome/browser/ui/autofill/autofill_dialog_view_tester.h @@ -9,7 +9,7 @@ #include "base/strings/string16.h" #include "chrome/browser/ui/autofill/autofill_dialog_types.h" #include "components/autofill/core/browser/field_types.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index 29ac63d..abea424 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc @@ -19,10 +19,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/screen.h" #include "ui/gfx/text_elider.h" #include "ui/gfx/text_utils.h" -#include "ui/gfx/vector2d.h" using base::WeakPtr; diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc index 5408393..58d0241 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc @@ -17,7 +17,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/test/test_utils.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace autofill { namespace { diff --git a/chrome/browser/ui/autofill/popup_controller_common.cc b/chrome/browser/ui/autofill/popup_controller_common.cc index 1ae4834c..1de4c56 100644 --- a/chrome/browser/ui/autofill/popup_controller_common.cc +++ b/chrome/browser/ui/autofill/popup_controller_common.cc @@ -11,8 +11,8 @@ #include "content/public/browser/web_contents.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/screen.h" -#include "ui/gfx/vector2d.h" namespace autofill { diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm index 41fe5cb..60cfa9a 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm @@ -15,7 +15,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" typedef InProcessBrowserTest BrowserCrApplicationAppleScriptTest; diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h index 39c26e1..250a235 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h @@ -11,7 +11,7 @@ #include "chrome/browser/ui/autofill/autofill_dialog_types.h" #include "chrome/browser/ui/autofill/autofill_dialog_view.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class NavigationController; diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.mm index 9f4cd9a..463ee81 100644 --- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.mm +++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "chrome/browser/ui/autofill/autofill_popup_controller.h" #import "chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace autofill { diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm index 629439c..d515508 100644 --- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm @@ -7,11 +7,11 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" -#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" +#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.h" #include "content/public/browser/web_contents.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" #include "ui/web_dialogs/web_dialog_ui.h" #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm index 7da75cf..3c71f00 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" @implementation WebDialogConstrainedWindowSheet diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.mm b/chrome/browser/ui/cocoa/dev_tools_controller.mm index fc0a4e8..52837a2 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller.mm +++ b/chrome/browser/ui/cocoa/dev_tools_controller.mm @@ -16,8 +16,8 @@ #include "content/public/browser/web_contents.h" #include "ui/base/cocoa/base_view.h" #include "ui/base/cocoa/focus_tracker.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" -#include "ui/gfx/size_conversions.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm index 7a0ae33..d19d772 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm @@ -19,7 +19,7 @@ #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h index dd8d88f..ab2dc9d 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "chrome/browser/extensions/extension_view.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" class Browser; class SkBitmap; diff --git a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.mm index e2a75fa..01b5edf 100644 --- a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.mm @@ -13,10 +13,10 @@ #include "chrome/browser/ui/panels/stacked_panel_collection.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_rep.h" -#include "ui/gfx/vector2d.h" #include "ui/snapshot/snapshot.h" // The delegate class to receive the notification from NSViewAnimation. diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm index fd93234..2c9f2db 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm @@ -15,7 +15,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" #include "ui/events/keycodes/keyboard_codes.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/web_dialogs/web_dialog_delegate.h" #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm index 6d08f34..e751dc0 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller_unittest.mm @@ -20,7 +20,7 @@ #include "content/public/browser/web_ui_message_handler.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.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/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc index a5aea0b..5c9b3a3 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc @@ -43,9 +43,9 @@ #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/pango_util.h" -#include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" #include "ui/resources/grit/ui_resources.h" diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc index 704472c..8bac9cb 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc @@ -17,7 +17,7 @@ #include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc index 861fa68..3dec05e 100644 --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/path.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/common_theme.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index 1594d03..6082893 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -30,8 +30,8 @@ #include "ui/gfx/color_analysis.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" DEFINE_WEB_CONTENTS_USER_DATA_KEY(MetroPinTabHelper); diff --git a/chrome/browser/ui/panels/panel_drag_controller.h b/chrome/browser/ui/panels/panel_drag_controller.h index 63abf34..d6960a3 100644 --- a/chrome/browser/ui/panels/panel_drag_controller.h +++ b/chrome/browser/ui/panels/panel_drag_controller.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/panels/panel_collection.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" class Panel; class PanelCollection; diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc index f40a294..8903032 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc @@ -33,7 +33,7 @@ #include "content/public/test/mock_render_process_host.h" #include "ipc/ipc_message.h" #include "ipc/ipc_test_sink.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using base::ASCIIToUTF16; diff --git a/chrome/browser/ui/sync/inline_login_dialog.cc b/chrome/browser/ui/sync/inline_login_dialog.cc index 2840f10..23e5e30 100644 --- a/chrome/browser/ui/sync/inline_login_dialog.cc +++ b/chrome/browser/ui/sync/inline_login_dialog.cc @@ -7,7 +7,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/url_constants.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" // static 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 27123b8..f3675ba 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 @@ -10,7 +10,7 @@ #include "ui/gfx/display.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 { 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 7ee7599..09cc27f 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 @@ -9,7 +9,7 @@ #include "ui/gfx/display.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 { 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 45087d0..94406f7 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 @@ -10,7 +10,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "ui/gfx/font.h" #include "ui/gfx/geometry/insets.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/styled_label.h" #include "ui/views/layout/box_layout.h" diff --git a/chrome/browser/ui/views/autofill/info_bubble.cc b/chrome/browser/ui/views/autofill/info_bubble.cc index 5893088..67990b1 100644 --- a/chrome/browser/ui/views/autofill/info_bubble.cc +++ b/chrome/browser/ui/views/autofill/info_bubble.cc @@ -7,7 +7,7 @@ #include "base/i18n/rtl.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/text_constants.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_frame_view.h" 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 2af2d59..6a60c47 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 @@ -11,7 +11,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "ui/gfx/geometry/insets.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/link.h" diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index 2e7dd69..13a1da9 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -11,7 +11,7 @@ #include "chrome/grit/generated_resources.h" #include "components/constrained_window/constrained_window_views.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/border.h" #include "ui/views/controls/message_box_view.h" #include "ui/views/layout/grid_layout.h" diff --git a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h index 58a870c..25cb8bc 100644 --- a/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h +++ b/chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/strings/string16.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/view.h" struct MediaGalleryPrefInfo; diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index ebb2bc3..9bf394b 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -24,8 +24,8 @@ #include "components/web_modal/web_contents_modal_dialog_host.h" #include "ui/base/hit_test.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/scrollbar_size.h" -#include "ui/gfx/size.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index ca6aa06..c9984ee 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h @@ -8,7 +8,7 @@ #include <string> #include "base/strings/string16.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/controls/label.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.h b/chrome/browser/ui/views/location_bar/keyword_hint_view.h index da374ff..fe27a71 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.h +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.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/views/view.h" class Profile; diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h index 228ed19..a00d5ba 100644 --- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h +++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ #include "base/compiler_specific.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/view.h" class PageActionImageView; diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc index 8719c9f..6883537 100644 --- a/chrome/browser/ui/views/location_bar/zoom_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_view.cc @@ -14,7 +14,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate) : BubbleIconView(nullptr, 0), diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.cc b/chrome/browser/ui/views/message_center/web_notification_tray.cc index 3a75011..d8a5611 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray.cc @@ -21,9 +21,9 @@ #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_skia_operations.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/message_center/message_center_tray.h" #include "ui/message_center/message_center_tray_delegate.h" #include "ui/message_center/views/desktop_popup_alignment_delegate.h" diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h index e5e49ee..8c99ace 100644 --- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h +++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h @@ -8,7 +8,7 @@ #include <algorithm> #include "base/basictypes.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/view_model.h" class Tab; diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 68ca9fd..0fa4752 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -41,11 +41,11 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #include "ui/views/controls/image_view.h" #include "ui/views/masked_targeter_delegate.h" diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc index 0808bff..1d73180 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc +++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc @@ -18,8 +18,8 @@ #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "ui/aura/window.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" #include "ui/views/widget/widget.h" namespace { 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 8836414..1664dfa 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 @@ -11,7 +11,7 @@ #include "components/web_modal/web_contents_modal_dialog_host.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/border.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index fe66142..7969a52 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc @@ -21,7 +21,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc index a8a18f8..c08acee 100644 --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc @@ -28,8 +28,8 @@ #include "grit/components_strings.h" #include "ui/chromeos/accessibility_types.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size.h" #include "ui/keyboard/keyboard_controller.h" #if !defined(USE_ATHENA) 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 47d2970..5b7622e 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,6 @@ #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/point.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index 5ad9484..d81e915 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -19,7 +19,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/views/widget/widget.h" #include "ui/web_dialogs/web_dialog_delegate.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 385050f..fdcbab2 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -33,7 +33,7 @@ #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/favicon_size.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skbitmap_operations.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc index 177ed14..0c29fcd6 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc @@ -24,8 +24,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/display.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" using ash::DisplayManager; diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index 681d014..bf29591 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -14,7 +14,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/common/extensions/api/notifications/notification_style.h b/chrome/common/extensions/api/notifications/notification_style.h index 81bbb2c..0cd36f3 100644 --- a/chrome/common/extensions/api/notifications/notification_style.h +++ b/chrome/common/extensions/api/notifications/notification_style.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_API_NOTIFICATIONS_NOTIFICATION_STYLE_H_ #define CHROME_COMMON_EXTENSIONS_API_NOTIFICATIONS_NOTIFICATION_STYLE_H_ -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" // This structure describes the size in DIPs of each type of image rendered // by the notification center within a notification. diff --git a/chrome/common/prerender_messages.h b/chrome/common/prerender_messages.h index ac50164..664df92 100644 --- a/chrome/common/prerender_messages.h +++ b/chrome/common/prerender_messages.h @@ -8,7 +8,7 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" #define IPC_MESSAGE_START PrerenderMsgStart diff --git a/chrome/common/print_messages.cc b/chrome/common/print_messages.cc index 401cef4..33420bc 100644 --- a/chrome/common/print_messages.cc +++ b/chrome/common/print_messages.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/strings/string16.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" PrintMsg_Print_Params::PrintMsg_Print_Params() : page_size(), diff --git a/chrome/common/web_application_info.h b/chrome/common/web_application_info.h index b90dbd8..5ff59ab 100644 --- a/chrome/common/web_application_info.h +++ b/chrome/common/web_application_info.h @@ -11,7 +11,7 @@ #include "base/strings/string16.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" // Structure used when installing a web page as an app. diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 63749ae..c1dba6f 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -49,8 +49,8 @@ #include "third_party/WebKit/public/web/WebView.h" #include "ui/base/ui_base_switches_util.h" #include "ui/gfx/favicon_size.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_f.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_f.h" #include "ui/gfx/skbitmap_operations.h" #include "v8/include/v8-testing.h" diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index 0a6abce..1d522a0 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -15,7 +15,7 @@ #include "base/timer/timer.h" #include "content/public/common/top_controls_state.h" #include "content/public/renderer/render_view_observer.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" class ContentSettingsObserver; diff --git a/chrome/renderer/prerender/prerender_extra_data.h b/chrome/renderer/prerender/prerender_extra_data.h index b1f4ebc..1d942dc 100644 --- a/chrome/renderer/prerender/prerender_extra_data.h +++ b/chrome/renderer/prerender/prerender_extra_data.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "third_party/WebKit/public/platform/WebPrerender.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace prerender { diff --git a/chrome/renderer/printing/mock_printer.h b/chrome/renderer/printing/mock_printer.h index d0b9974..ebdcb28 100644 --- a/chrome/renderer/printing/mock_printer.h +++ b/chrome/renderer/printing/mock_printer.h @@ -15,7 +15,7 @@ #include "printing/image.h" #include "third_party/WebKit/public/web/WebPrintScalingOption.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" struct PrintMsg_Print_Params; struct PrintMsg_PrintPages_Params; diff --git a/chrome/renderer/printing/print_web_view_helper.h b/chrome/renderer/printing/print_web_view_helper.h index f144adc..9ba0810 100644 --- a/chrome/renderer/printing/print_web_view_helper.h +++ b/chrome/renderer/printing/print_web_view_helper.h @@ -19,7 +19,7 @@ #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebPrintParams.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" struct PrintMsg_Print_Params; struct PrintMsg_PrintPage_Params; diff --git a/chrome/renderer/web_apps.cc b/chrome/renderer/web_apps.cc index e684a70..359cb8b 100644 --- a/chrome/renderer/web_apps.cc +++ b/chrome/renderer/web_apps.cc @@ -24,7 +24,7 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebNodeList.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" using blink::WebDocument; diff --git a/chrome/renderer/web_apps.h b/chrome/renderer/web_apps.h index e21a300..80a1180 100644 --- a/chrome/renderer/web_apps.h +++ b/chrome/renderer/web_apps.h @@ -9,7 +9,7 @@ #include <vector> #include "base/strings/string16.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace blink { class WebFrame; diff --git a/chrome/renderer/webview_color_overlay.cc b/chrome/renderer/webview_color_overlay.cc index 968784f..32e8a66 100644 --- a/chrome/renderer/webview_color_overlay.cc +++ b/chrome/renderer/webview_color_overlay.cc @@ -6,11 +6,11 @@ #include "base/logging.h" #include "content/public/renderer/render_view.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" -#include "third_party/WebKit/public/web/WebView.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" WebViewColorOverlay::WebViewColorOverlay(content::RenderView* render_view, diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 33adc50..e84cfb2 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -23,7 +23,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/zlib/google/zip.h" #include "ui/gfx/codec/jpeg_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if !defined(OS_ANDROID) #include "chrome/utility/profile_import_handler.h" diff --git a/chrome/utility/cloud_print/bitmap_image.h b/chrome/utility/cloud_print/bitmap_image.h index 8ea6d2c..cfa3610 100644 --- a/chrome/utility/cloud_print/bitmap_image.h +++ b/chrome/utility/cloud_print/bitmap_image.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cloud_print { diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc index 9a92d90..ba82e59 100644 --- a/chrome/utility/extensions/unpacker.cc +++ b/chrome/utility/extensions/unpacker.cc @@ -33,7 +33,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/zlib/google/zip.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace extensions { diff --git a/chromecast/browser/android/cast_window_android.h b/chromecast/browser/android/cast_window_android.h index fec8b39..281f140 100644 --- a/chromecast/browser/android/cast_window_android.h +++ b/chromecast/browser/android/cast_window_android.h @@ -21,8 +21,8 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_switches.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" class GURL; diff --git a/chromecast/browser/media/cma_message_filter_host.cc b/chromecast/browser/media/cma_message_filter_host.cc index 2fc590c..ae80db1 100644 --- a/chromecast/browser/media/cma_message_filter_host.cc +++ b/chromecast/browser/media/cma_message_filter_host.cc @@ -20,7 +20,7 @@ #include "media/base/bind_to_current_loop.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/quad_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chromecast { namespace media { diff --git a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc index 2a60e37..d6ec43e 100644 --- a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc +++ b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc @@ -9,7 +9,7 @@ #include "chromecast/media/cma/ipc/media_message.h" #include "media/base/video_decoder_config.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chromecast { namespace media { diff --git a/chromecast/media/cma/test/mock_frame_provider.cc b/chromecast/media/cma/test/mock_frame_provider.cc index 7a30838..1715b56 100644 --- a/chromecast/media/cma/test/mock_frame_provider.cc +++ b/chromecast/media/cma/test/mock_frame_provider.cc @@ -15,7 +15,7 @@ #include "media/base/video_decoder_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace chromecast { namespace media { diff --git a/components/constrained_window/constrained_window_views_unittest.cc b/components/constrained_window/constrained_window_views_unittest.cc index 9e7c9d6..645e559 100644 --- a/components/constrained_window/constrained_window_views_unittest.cc +++ b/components/constrained_window/constrained_window_views_unittest.cc @@ -7,8 +7,8 @@ #include "components/web_modal/test_web_contents_modal_dialog_host.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/views/border.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/components/dom_distiller/core/distiller_page.h b/components/dom_distiller/core/distiller_page.h index 7119f0d0..74cf277 100644 --- a/components/dom_distiller/core/distiller_page.h +++ b/components/dom_distiller/core/distiller_page.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/values.h" #include "third_party/dom_distiller_js/dom_distiller.pb.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" namespace dom_distiller { diff --git a/components/dom_distiller/core/viewer.h b/components/dom_distiller/core/viewer.h index 45b7e95..9e1ded3 100644 --- a/components/dom_distiller/core/viewer.h +++ b/components/dom_distiller/core/viewer.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "components/dom_distiller/core/distilled_page_prefs.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace dom_distiller { diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h index f99f038..ea64754 100644 --- a/components/favicon_base/favicon_types.h +++ b/components/favicon_base/favicon_types.h @@ -6,8 +6,8 @@ #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ #include "base/memory/ref_counted_memory.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" #include "url/gurl.h" namespace favicon_base { diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc index af547f3..dea071f 100644 --- a/components/favicon_base/favicon_util.cc +++ b/components/favicon_base/favicon_util.cc @@ -14,9 +14,9 @@ #include "ui/base/layout.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.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/size.h" #if defined(OS_MACOSX) && !defined(OS_IOS) #include "base/mac/mac_util.h" diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc index 492d211..1a1e526 100644 --- a/components/favicon_base/select_favicon_frames.cc +++ b/components/favicon_base/select_favicon_frames.cc @@ -13,10 +13,10 @@ #include "components/favicon_base/favicon_util.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/gfx/geometry/size.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" namespace { diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h index a5c8fe5..6f3864b 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -21,7 +21,7 @@ #include "components/history/core/browser/url_row.h" #include "components/history/core/common/thumbnail_score.h" #include "ui/base/page_transition_types.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" class PageUsageData; diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h index 8c1284a..ebced9f 100644 --- a/components/infobars/core/infobar.h +++ b/components/infobars/core/infobar.h @@ -12,7 +12,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace infobars { diff --git a/components/metrics/gpu/gpu_metrics_provider.h b/components/metrics/gpu/gpu_metrics_provider.h index 06bbba3..4ca2a96 100644 --- a/components/metrics/gpu/gpu_metrics_provider.h +++ b/components/metrics/gpu/gpu_metrics_provider.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "components/metrics/metrics_provider.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace metrics { diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc index 931b731..83d345d 100644 --- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc +++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "components/metrics/proto/chrome_user_metrics_extension.pb.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace metrics { diff --git a/components/wallpaper/wallpaper_resizer.h b/components/wallpaper/wallpaper_resizer.h index 0fac55a..a7ec1f0 100644 --- a/components/wallpaper/wallpaper_resizer.h +++ b/components/wallpaper/wallpaper_resizer.h @@ -12,8 +12,8 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.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" namespace base { class SequencedWorkerPool; diff --git a/components/web_modal/test_web_contents_modal_dialog_host.h b/components/web_modal/test_web_contents_modal_dialog_host.h index 1ba4d13..28c7c2f 100644 --- a/components/web_modal/test_web_contents_modal_dialog_host.h +++ b/components/web_modal/test_web_contents_modal_dialog_host.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" namespace web_modal { diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 1b343c4..189ac67d 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -54,9 +54,9 @@ #include "ui/base/android/view_android.h" #include "ui/base/android/window_android.h" #include "ui/gfx/android/java_bitmap.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/size_f.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/size_f.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc index c4a5069..e658041 100644 --- a/content/browser/android/content_view_render_view.cc +++ b/content/browser/android/content_view_render_view.cc @@ -18,7 +18,7 @@ #include "content/public/browser/android/layer_tree_build_helper.h" #include "jni/ContentViewRenderView_jni.h" #include "ui/gfx/android/java_bitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include <android/bitmap.h> #include <android/native_window_jni.h> diff --git a/content/browser/compositor/buffer_queue.h b/content/browser/compositor/buffer_queue.h index a54d022..db7fcc5 100644 --- a/content/browser/compositor/buffer_queue.h +++ b/content/browser/compositor/buffer_queue.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { class ContextProvider; diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc index d38ec23..c7c867e 100644 --- a/content/browser/compositor/gpu_process_transport_factory.cc +++ b/content/browser/compositor/gpu_process_transport_factory.cc @@ -43,8 +43,8 @@ #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_constants.h" #include "ui/compositor/compositor_switches.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #if defined(OS_WIN) #include "content/browser/compositor/software_output_device_win.h" diff --git a/content/browser/compositor/reflector_impl.h b/content/browser/compositor/reflector_impl.h index f771fe4..4d0da018 100644 --- a/content/browser/compositor/reflector_impl.h +++ b/content/browser/compositor/reflector_impl.h @@ -12,7 +12,7 @@ #include "content/browser/compositor/image_transport_factory.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "ui/compositor/reflector.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoopProxy; } diff --git a/content/browser/compositor/resize_lock.h b/content/browser/compositor/resize_lock.h index 07acff3..306a19d 100644 --- a/content/browser/compositor/resize_lock.h +++ b/content/browser/compositor/resize_lock.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc index 9be28d1..52dd6cf 100644 --- a/content/browser/compositor/software_output_device_ozone_unittest.cc +++ b/content/browser/compositor/software_output_device_ozone_unittest.cc @@ -11,7 +11,7 @@ #include "third_party/skia/include/core/SkSurface.h" #include "ui/compositor/compositor.h" #include "ui/compositor/test/context_factories_for_test.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/vsync_provider.h" #include "ui/gl/gl_implementation.h" diff --git a/content/browser/devtools/protocol/color_picker.cc b/content/browser/devtools/protocol/color_picker.cc index 8b586d4..413fcfa 100644 --- a/content/browser/devtools/protocol/color_picker.cc +++ b/content/browser/devtools/protocol/color_picker.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebScreenInfo.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace content { namespace devtools { diff --git a/content/browser/devtools/protocol/page_handler.cc b/content/browser/devtools/protocol/page_handler.cc index 903fac7..bf2af0b 100644 --- a/content/browser/devtools/protocol/page_handler.cc +++ b/content/browser/devtools/protocol/page_handler.cc @@ -33,7 +33,7 @@ #include "ui/base/page_transition_types.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/snapshot/snapshot.h" #include "url/gurl.h" diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index 1a79b0b..3600de8 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -26,9 +26,9 @@ #include "gpu/config/gpu_info.h" #include "ipc/ipc_sender.h" #include "ipc/message_filter.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "url/gurl.h" struct GPUCreateCommandBufferConfig; diff --git a/content/browser/gpu/gpu_surface_tracker.h b/content/browser/gpu/gpu_surface_tracker.h index 03d182f..437a2f9 100644 --- a/content/browser/gpu/gpu_surface_tracker.h +++ b/content/browser/gpu/gpu_surface_tracker.h @@ -12,8 +12,8 @@ #include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "content/common/gpu/gpu_surface_lookup.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" namespace content { diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc index af7e616..a297b0a 100644 --- a/content/browser/renderer_host/clipboard_message_filter.cc +++ b/content/browser/renderer_host/clipboard_message_filter.cc @@ -19,7 +19,7 @@ #include "ui/base/clipboard/custom_data_helper.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" namespace content { diff --git a/content/browser/renderer_host/clipboard_message_filter_unittest.cc b/content/browser/renderer_host/clipboard_message_filter_unittest.cc index 0d65dbd..25577f7 100644 --- a/content/browser/renderer_host/clipboard_message_filter_unittest.cc +++ b/content/browser/renderer_host/clipboard_message_filter_unittest.cc @@ -13,7 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/test/test_clipboard.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/browser/renderer_host/dip_util.cc b/content/browser/renderer_host/dip_util.cc index 07d2a1e..225d17b 100644 --- a/content/browser/renderer_host/dip_util.cc +++ b/content/browser/renderer_host/dip_util.cc @@ -12,9 +12,9 @@ #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/screen.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_conversions.h" namespace content { diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h index b4c66b2..9ddb725 100644 --- a/content/browser/renderer_host/input/touch_emulator.h +++ b/content/browser/renderer_host/input/touch_emulator.h @@ -10,7 +10,7 @@ #include "content/common/input/input_event_ack_state.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/gesture_detection/filtered_gesture_provider.h" -#include "ui/gfx/size_f.h" +#include "ui/gfx/geometry/size_f.h" namespace content { diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.h b/content/browser/renderer_host/media/video_capture_buffer_pool.h index 0ee32a7..54cb0c3 100644 --- a/content/browser/renderer_host/media/video_capture_buffer_pool.h +++ b/content/browser/renderer_host/media/video_capture_buffer_pool.h @@ -14,7 +14,7 @@ #include "base/process/process.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 4cf0f14..c02b51a 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -67,8 +67,8 @@ #include "third_party/WebKit/public/web/WebCompositionUnderline.h" #include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/vector2d_conversions.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/snapshot/snapshot.h" diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index d1de2e2..715c84f 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -78,8 +78,8 @@ #include "ui/gfx/android/view_configuration.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/dip_util.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/touch_selection/touch_selection_controller.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index d1f9314..e31d4eb 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -70,8 +70,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/wm/public/activation_client.h" #include "ui/wm/public/scoped_tooltip_disabler.h" diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index fcd96dc..3aacfdf 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -13,9 +13,9 @@ #include "content/common/content_switches_internal.h" #include "content/public/browser/render_widget_host_view_frame_subscriber.h" #include "ui/gfx/display.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/size_f.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/size_f.h" #if defined(OS_WIN) #include "base/command_line.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 ae6cdfc..924c274 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -74,9 +74,9 @@ #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" #include "ui/gfx/screen.h" -#include "ui/gfx/size_conversions.h" #include "ui/gl/gl_switches.h" using content::BrowserAccessibility; diff --git a/content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h b/content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h index a14d312..4a94d9f 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h +++ b/content/browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_DICTIONARY_HELPER_H_ #include "base/basictypes.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace content { diff --git a/content/browser/web_contents/aura/image_window_delegate.cc b/content/browser/web_contents/aura/image_window_delegate.cc index 7979ab3..25878ea 100644 --- a/content/browser/web_contents/aura/image_window_delegate.cc +++ b/content/browser/web_contents/aura/image_window_delegate.cc @@ -9,9 +9,9 @@ #include "ui/compositor/compositor.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/image/image_skia.h" -#include "ui/gfx/size.h" namespace content { diff --git a/content/browser/web_contents/aura/image_window_delegate.h b/content/browser/web_contents/aura/image_window_delegate.h index 53cf88e..a36110d 100644 --- a/content/browser/web_contents/aura/image_window_delegate.h +++ b/content/browser/web_contents/aura/image_window_delegate.h @@ -7,8 +7,8 @@ #include "content/common/content_export.h" #include "ui/aura/window_delegate.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size.h" namespace content { diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 3ccf3cb..cf0f505 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -39,7 +39,7 @@ #include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/page_transition_types.h" #include "ui/gfx/geometry/rect_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" struct BrowserPluginHostMsg_ResizeGuest_Params; struct ViewHostMsg_DateTimeDialogValue_Params; diff --git a/content/browser/web_contents/web_contents_view.h b/content/browser/web_contents/web_contents_view.h index 85581c1..439dda4 100644 --- a/content/browser/web_contents/web_contents_view.h +++ b/content/browser/web_contents/web_contents_view.h @@ -11,8 +11,8 @@ #include "base/strings/string16.h" #include "content/common/content_export.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" namespace content { class RenderViewHost; diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc index 46e28fb..ce86440 100644 --- a/content/browser/web_contents/web_contents_view_guest.cc +++ b/content/browser/web_contents/web_contents_view_guest.cc @@ -19,8 +19,8 @@ #include "content/public/common/drop_data.h" #include "ui/gfx/geometry/point.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" #if defined(USE_AURA) #include "ui/aura/window.h" diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h index 93c1eaf..aa279bc 100644 --- a/content/browser/web_contents/web_contents_view_mac.h +++ b/content/browser/web_contents/web_contents_view_mac.h @@ -17,7 +17,7 @@ #include "content/common/content_export.h" #include "content/common/drag_event_source_info.h" #include "ui/base/cocoa/base_view.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @class FocusTracker; class SkBitmap; diff --git a/content/child/child_shared_bitmap_manager.cc b/content/child/child_shared_bitmap_manager.cc index 6698232..5cccb6d36 100644 --- a/content/child/child_shared_bitmap_manager.cc +++ b/content/child/child_shared_bitmap_manager.cc @@ -8,7 +8,7 @@ #include "base/process/process_metrics.h" #include "content/child/child_thread.h" #include "content/common/child_process_messages.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/child/image_decoder.h b/content/child/image_decoder.h index 70e1b7f..535c423 100644 --- a/content/child/image_decoder.h +++ b/content/child/image_decoder.h @@ -5,7 +5,7 @@ #include <vector> #include "base/basictypes.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/content/child/npapi/webplugin_accelerated_surface_mac.h b/content/child/npapi/webplugin_accelerated_surface_mac.h index f0e6d6f..d91f8f2 100644 --- a/content/child/npapi/webplugin_accelerated_surface_mac.h +++ b/content/child/npapi/webplugin_accelerated_surface_mac.h @@ -5,8 +5,8 @@ #ifndef CONTENT_CHILD_NPAPI_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_ #define CONTENT_CHILD_NPAPI_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_ +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" // Avoid having to include OpenGL headers here. typedef struct _CGLContextObject* CGLContextObj; diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index f514018..5fe5402 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -24,8 +24,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#include "ui/gfx/size.h" #include "url/gurl.h" #undef IPC_MESSAGE_EXPORT diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h index 6c73337..cd78c58 100644 --- a/content/common/cursors/webcursor.h +++ b/content/common/cursors/webcursor.h @@ -12,8 +12,8 @@ #include "third_party/WebKit/public/platform/WebCursorInfo.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #if defined(USE_AURA) #include "ui/base/cursor/cursor.h" diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm index 3a52d83..3f40610 100644 --- a/content/common/cursors/webcursor_mac.mm +++ b/content/common/cursors/webcursor_mac.mm @@ -16,8 +16,8 @@ #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/geometry/size_conversions.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size_conversions.h" using blink::WebCursorInfo; using blink::WebSize; diff --git a/content/common/drag_messages.h b/content/common/drag_messages.h index 2be7a3b..3db2428 100644 --- a/content/common/drag_messages.h +++ b/content/common/drag_messages.h @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/web/WebDragOperation.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" #define IPC_MESSAGE_START DragMsgStart diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc index 3364883..a3cd9dd 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.cc +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc @@ -20,7 +20,7 @@ #include "gpu/command_buffer/common/command_buffer_shared.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/service/image_factory.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace content { diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index 8e98df4..7178acc 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -25,7 +25,7 @@ #include "media/base/video_util.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using gpu::gles2::GLES2Interface; diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc index 82b0203..d21a7d6 100644 --- a/content/common/gpu/client/gl_helper_scaling.cc +++ b/content/common/gpu/client/gl_helper_scaling.cc @@ -18,7 +18,7 @@ #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using gpu::gles2::GLES2Interface; diff --git a/content/common/gpu/client/gl_helper_scaling.h b/content/common/gpu/client/gl_helper_scaling.h index dba58e8..af7b7fc 100644 --- a/content/common/gpu/client/gl_helper_scaling.h +++ b/content/common/gpu/client/gl_helper_scaling.h @@ -11,7 +11,7 @@ #include "content/common/gpu/client/gl_helper.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index 9a73476..877baa0 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -23,9 +23,9 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" #include "ipc/message_filter.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gpu_preference.h" class GURL; diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h index dc792246..e5dea69 100644 --- a/content/common/gpu/client/gpu_memory_buffer_impl.h +++ b/content/common/gpu/client/gpu_memory_buffer_impl.h @@ -8,8 +8,8 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/size.h" namespace content { diff --git a/content/common/gpu/client/gpu_video_decode_accelerator_host.h b/content/common/gpu/client/gpu_video_decode_accelerator_host.h index 4cbeeb1..e70053d 100644 --- a/content/common/gpu/client/gpu_video_decode_accelerator_host.h +++ b/content/common/gpu/client/gpu_video_decode_accelerator_host.h @@ -12,7 +12,7 @@ #include "content/common/gpu/client/command_buffer_proxy_impl.h" #include "ipc/ipc_listener.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class GpuChannelHost; diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 0db58ef..2054b18 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -21,8 +21,8 @@ #include "content/common/message_router.h" #include "gpu/command_buffer/service/valuebuffer_manager.h" #include "ipc/ipc_sync_channel.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_share_group.h" #include "ui/gl/gpu_preference.h" diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index 34701b7..2fad94a 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -24,9 +24,9 @@ #include "ipc/ipc_sender.h" #include "media/base/video_decoder_config.h" #include "ui/events/latency_info.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gpu_preference.h" #include "url/gurl.h" diff --git a/content/common/gpu/gpu_memory_manager_client.h b/content/common/gpu/gpu_memory_manager_client.h index 2058e46..0c6c7d0 100644 --- a/content/common/gpu/gpu_memory_manager_client.h +++ b/content/common/gpu/gpu_memory_manager_client.h @@ -11,7 +11,7 @@ #include "content/common/content_export.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/service/memory_tracking.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc index 18ebce2..d0237fb 100644 --- a/content/common/gpu/gpu_memory_manager_unittest.cc +++ b/content/common/gpu/gpu_memory_manager_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "content/common/gpu/gpu_memory_manager.h" + #include "content/common/gpu/gpu_memory_manager_client.h" #include "content/common/gpu/gpu_memory_tracking.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" -#include "ui/gfx/size_conversions.h" - #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/geometry/size_conversions.h" using gpu::MemoryAllocation; diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 07510b1..6e32684 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -30,9 +30,9 @@ #include "media/video/video_decode_accelerator.h" #include "media/video/video_encode_accelerator.h" #include "ui/events/latency_info.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gpu_preference.h" #if defined(OS_ANDROID) diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index 6038f5d..f87d9d8 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -17,8 +17,8 @@ #include "ipc/ipc_message.h" #include "ui/events/latency_info.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/gl/gl_surface.h" struct AcceleratedSurfaceMsg_BufferPresented_Params; diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 3d3a437..34f996e 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -40,7 +40,7 @@ #include "content/common/gpu/media/android_video_decode_accelerator.h" #endif -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h index e59a76f..3496e2f 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.h +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h @@ -17,7 +17,7 @@ #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoopProxy; diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.h b/content/common/gpu/media/gpu_video_encode_accelerator.h index ca60f6f..582333a 100644 --- a/content/common/gpu/media/gpu_video_encode_accelerator.h +++ b/content/common/gpu/media/gpu_video_encode_accelerator.h @@ -13,7 +13,7 @@ #include "gpu/config/gpu_info.h" #include "ipc/ipc_listener.h" #include "media/video/video_encode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h index 9b97310..0171479 100644 --- a/content/common/gpu/media/v4l2_video_decode_accelerator.h +++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h @@ -23,7 +23,7 @@ #include "media/base/video_decoder_config.h" #include "media/video/picture.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace base { diff --git a/content/common/gpu/media/v4l2_video_device.h b/content/common/gpu/media/v4l2_video_device.h index f4b368f..346dff1 100644 --- a/content/common/gpu/media/v4l2_video_device.h +++ b/content/common/gpu/media/v4l2_video_device.h @@ -11,7 +11,7 @@ #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace content { diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.h b/content/common/gpu/media/v4l2_video_encode_accelerator.h index 267d0d0..b77f936 100644 --- a/content/common/gpu/media/v4l2_video_encode_accelerator.h +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.h @@ -5,8 +5,8 @@ #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ -#include <list> #include <linux/videodev2.h> +#include <list> #include <vector> #include "base/memory/linked_ptr.h" @@ -16,7 +16,7 @@ #include "content/common/gpu/media/v4l2_image_processor.h" #include "content/common/gpu/media/v4l2_video_device.h" #include "media/video/video_encode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/common/gpu/media/va_surface.h b/content/common/gpu/media/va_surface.h index 5934bc5..c76c11f 100644 --- a/content/common/gpu/media/va_surface.h +++ b/content/common/gpu/media/va_surface.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "third_party/libva/va/va.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/vaapi_picture.h b/content/common/gpu/media/vaapi_picture.h index fbb41bf..44d9db7 100644 --- a/content/common/gpu/media/vaapi_picture.h +++ b/content/common/gpu/media/vaapi_picture.h @@ -14,7 +14,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/vaapi_tfp_picture.h b/content/common/gpu/media/vaapi_tfp_picture.h index c6deba4..02a1a23 100644 --- a/content/common/gpu/media/vaapi_tfp_picture.h +++ b/content/common/gpu/media/vaapi_tfp_picture.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "content/common/gpu/media/vaapi_picture.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace gfx { diff --git a/content/common/gpu/media/vaapi_wrapper.h b/content/common/gpu/media/vaapi_wrapper.h index c4e72a4..fe53552 100644 --- a/content/common/gpu/media/vaapi_wrapper.h +++ b/content/common/gpu/media/vaapi_wrapper.h @@ -21,7 +21,7 @@ #include "media/base/video_frame.h" #include "third_party/libva/va/va.h" #include "third_party/libva/va/va_vpp.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(USE_X11) #include "third_party/libva/va/va_x11.h" #endif // USE_X11 diff --git a/content/common/gpu/stream_texture_android.cc b/content/common/gpu/stream_texture_android.cc index eb7f3bb..5985821 100644 --- a/content/common/gpu/stream_texture_android.cc +++ b/content/common/gpu/stream_texture_android.cc @@ -12,7 +12,7 @@ #include "gpu/command_buffer/service/context_state.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/scoped_make_current.h" namespace content { diff --git a/content/common/host_shared_bitmap_manager.cc b/content/common/host_shared_bitmap_manager.cc index 8182e0b..778260b 100644 --- a/content/common/host_shared_bitmap_manager.cc +++ b/content/common/host_shared_bitmap_manager.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "content/common/view_messages.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/image_messages.h b/content/common/image_messages.h index f2f734d..b886908 100644 --- a/content/common/image_messages.h +++ b/content/common/image_messages.h @@ -9,7 +9,7 @@ #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #define IPC_MESSAGE_START ImageMsgStart diff --git a/content/common/input/synthetic_smooth_scroll_gesture_params.h b/content/common/input/synthetic_smooth_scroll_gesture_params.h index 813d06d..1fd0b30 100644 --- a/content/common/input/synthetic_smooth_scroll_gesture_params.h +++ b/content/common/input/synthetic_smooth_scroll_gesture_params.h @@ -10,7 +10,7 @@ #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace content { diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h index 742bf01..3cff0ea 100644 --- a/content/public/browser/android/compositor.h +++ b/content/public/browser/android/compositor.h @@ -10,8 +10,8 @@ #include "content/common/content_export.h" #include "ui/android/resources/ui_resource_provider.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" class SkBitmap; diff --git a/content/public/browser/android/synchronous_compositor.h b/content/public/browser/android/synchronous_compositor.h index 144888c..1e39b09 100644 --- a/content/public/browser/android/synchronous_compositor.h +++ b/content/public/browser/android/synchronous_compositor.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "gpu/command_buffer/service/in_process_command_buffer.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkCanvas; diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index efc59ff..1dde898 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -14,7 +14,7 @@ #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/surface/transport_dib.h" #if defined(OS_MACOSX) diff --git a/content/public/child/image_decoder_utils.h b/content/public/child/image_decoder_utils.h index e756515..b2e3562 100644 --- a/content/public/child/image_decoder_utils.h +++ b/content/public/child/image_decoder_utils.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 51ca4a2..6bb7014 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/jpeg_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/surface/transport_dib.h" namespace content { diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc index b1196f7..410e20b 100644 --- a/content/renderer/child_frame_compositing_helper.cc +++ b/content/renderer/child_frame_compositing_helper.cc @@ -25,7 +25,7 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/skia_util.h" namespace content { diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h index b6c4d57..0700d9c 100644 --- a/content/renderer/child_frame_compositing_helper.h +++ b/content/renderer/child_frame_compositing_helper.h @@ -13,7 +13,7 @@ #include "base/memory/shared_memory.h" #include "cc/layers/delegated_frame_resource_collection.h" #include "content/common/content_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class SharedMemory; diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc index 9fff7b9..de17eb2 100644 --- a/content/renderer/disambiguation_popup_helper.cc +++ b/content/renderer/disambiguation_popup_helper.cc @@ -5,7 +5,7 @@ #include "content/renderer/disambiguation_popup_helper.h" #include "third_party/WebKit/public/platform/WebRect.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" using blink::WebRect; using blink::WebVector; diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc index 86137951..5921e30 100644 --- a/content/renderer/disambiguation_popup_helper_unittest.cc +++ b/content/renderer/disambiguation_popup_helper_unittest.cc @@ -8,8 +8,8 @@ #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "ui/gfx/geometry/rect.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" // these constants are copied from the implementation class namespace { diff --git a/content/renderer/fetchers/image_resource_fetcher.cc b/content/renderer/fetchers/image_resource_fetcher.cc index ec0798b..a0ec673 100644 --- a/content/renderer/fetchers/image_resource_fetcher.cc +++ b/content/renderer/fetchers/image_resource_fetcher.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using blink::WebFrame; using blink::WebURLRequest; diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc index d310f42..33868c3 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc @@ -11,7 +11,7 @@ #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using blink::WebFrame; using blink::WebURLRequest; diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h index fc6ba22..1480af3 100644 --- a/content/renderer/gpu/mailbox_output_surface.h +++ b/content/renderer/gpu/mailbox_output_surface.h @@ -11,7 +11,7 @@ #include "cc/resources/resource_format.h" #include "cc/resources/transferable_resource.h" #include "content/renderer/gpu/compositor_output_surface.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { class CompositorFrameAck; diff --git a/content/renderer/image_loading_helper.cc b/content/renderer/image_loading_helper.cc index b0099ff..7b7982a 100644 --- a/content/renderer/image_loading_helper.cc +++ b/content/renderer/image_loading_helper.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/favicon_size.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/skbitmap_operations.h" #include "url/url_constants.h" diff --git a/content/renderer/media/android/stream_texture_factory.h b/content/renderer/media/android/stream_texture_factory.h index 8d04800..deb6dfe 100644 --- a/content/renderer/media/android/stream_texture_factory.h +++ b/content/renderer/media/android/stream_texture_factory.h @@ -10,7 +10,7 @@ #include "base/message_loop/message_loop_proxy.h" #include "cc/layers/video_frame_provider.h" #include "gpu/command_buffer/common/mailbox.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gpu { namespace gles2 { diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc index 48b5861..9756f39 100644 --- a/content/renderer/media/android/stream_texture_factory_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_impl.cc @@ -9,7 +9,7 @@ #include "content/common/gpu/gpu_messages.h" #include "content/renderer/gpu/stream_texture_host_android.h" #include "gpu/command_buffer/client/gles2_interface.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h index dccabfa..2d25de3 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h @@ -14,7 +14,7 @@ #include "content/child/thread_safe_sender.h" #include "content/common/content_export.h" #include "media/filters/gpu_video_accelerator_factories.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class WaitableEvent; diff --git a/content/renderer/media/rtc_video_encoder.h b/content/renderer/media/rtc_video_encoder.h index 6516f86..1b18105 100644 --- a/content/renderer/media/rtc_video_encoder.h +++ b/content/renderer/media/rtc_video_encoder.h @@ -15,7 +15,7 @@ #include "content/common/content_export.h" #include "media/base/video_decoder_config.h" #include "third_party/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/renderer/media/rtc_video_renderer.h b/content/renderer/media/rtc_video_renderer.h index 699fe84..924b003 100644 --- a/content/renderer/media/rtc_video_renderer.h +++ b/content/renderer/media/rtc_video_renderer.h @@ -12,7 +12,7 @@ #include "content/public/renderer/media_stream_video_sink.h" #include "content/renderer/media/video_frame_provider.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoopProxy; diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index 5a08619..32cac5d 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -47,8 +47,8 @@ #include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/blit.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #if defined(OS_POSIX) diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h index 2e70cad..31cea39 100644 --- a/content/renderer/pepper/content_decryptor_delegate.h +++ b/content/renderer/pepper/content_decryptor_delegate.h @@ -23,7 +23,7 @@ #include "ppapi/c/pp_time.h" #include "ppapi/c/private/pp_content_decryptor.h" #include "ppapi/c/private/ppp_content_decryptor_private.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class AudioDecoderConfig; diff --git a/content/renderer/pepper/gfx_conversion.h b/content/renderer/pepper/gfx_conversion.h index daf0ef9..1fe529b 100644 --- a/content/renderer/pepper/gfx_conversion.h +++ b/content/renderer/pepper/gfx_conversion.h @@ -11,7 +11,7 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" // Conversions for graphics types between our gfx library and PPAPI. // The style of naming is to match the PP_Bool conversions. diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index 7fa6eb8..19a295f 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc @@ -34,8 +34,8 @@ #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_conversions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" -#include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" #if defined(OS_MACOSX) diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index 2b70dc8..df80cd5 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -17,7 +17,7 @@ #include "third_party/WebKit/public/platform/WebCanvas.h" #include "ui/events/latency_info.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { class SharedBitmap; diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h index 1ed8052..e9a562b 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/ppb_video_frame.h" #include "ppapi/shared_impl/media_stream_video_track_shared.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 6afd040..bd8d127 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -186,8 +186,8 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size_conversions.h" #include "v8/include/v8.h" #if defined(OS_ANDROID) diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index c11cf25..60adf97 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -70,7 +70,7 @@ #include "ui/gfx/frame_time.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" #include "ui/gfx/skia_util.h" #include "ui/gl/gl_switches.h" #include "ui/surface/transport_dib.h" diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 5ec9d9b..aa94dd0 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -23,7 +23,7 @@ #include "third_party/WebKit/public/platform/WebLayer.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/web/WebWidget.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gl/gpu_preference.h" using blink::WebCanvas; diff --git a/content/renderer/renderer_clipboard_delegate.cc b/content/renderer/renderer_clipboard_delegate.cc index 4a184bed..b8d0b0c 100644 --- a/content/renderer/renderer_clipboard_delegate.cc +++ b/content/renderer/renderer_clipboard_delegate.cc @@ -13,7 +13,7 @@ #include "content/renderer/render_thread_impl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index fdcfc7a..0323d7a 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" #include "ipc/ipc_channel.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #if defined(OS_ANDROID) #include "base/android/scoped_java_ref.h" diff --git a/content/shell/browser/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h index 925a208..0bbe995 100644 --- a/content/shell/browser/webkit_test_controller.h +++ b/content/shell/browser/webkit_test_controller.h @@ -18,7 +18,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/web_preferences.h" #include "content/shell/common/leak_detection_result.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_ANDROID) #include "base/threading/thread_restrictions.h" diff --git a/content/shell/common/shell_test_configuration.h b/content/shell/common/shell_test_configuration.h index d2d8ead..74b5d0b 100644 --- a/content/shell/common/shell_test_configuration.h +++ b/content/shell/common/shell_test_configuration.h @@ -8,7 +8,7 @@ #include <string> #include "base/files/file_path.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" namespace content { diff --git a/content/test/mock_webclipboard_impl.cc b/content/test/mock_webclipboard_impl.cc index 88f4e9f..8a6e774 100644 --- a/content/test/mock_webclipboard_impl.cc +++ b/content/test/mock_webclipboard_impl.cc @@ -16,7 +16,7 @@ #include "third_party/WebKit/public/platform/WebURL.h" #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using blink::WebDragData; using blink::WebString; diff --git a/content/test/test_video_frame_provider.h b/content/test/test_video_frame_provider.h index 0a320a2..d3a4590 100644 --- a/content/test/test_video_frame_provider.h +++ b/content/test/test_video_frame_provider.h @@ -7,7 +7,7 @@ #include "base/time/time.h" #include "content/renderer/media/video_frame_provider.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoopProxy; diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc index 069dc66..8e3f957 100644 --- a/extensions/browser/extension_icon_image.cc +++ b/extensions/browser/extension_icon_image.cc @@ -12,12 +12,12 @@ #include "extensions/browser/notification_types.h" #include "extensions/common/extension.h" #include "ui/gfx/canvas.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.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/size_conversions.h" // The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that // are computed and updated using the following algorithm (if no default icon diff --git a/extensions/browser/image_loader.h b/extensions/browser/image_loader.h index 674cd1e..4cbc927 100644 --- a/extensions/browser/image_loader.h +++ b/extensions/browser/image_loader.h @@ -14,7 +14,7 @@ #include "extensions/common/extension_resource.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/layout.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class BrowserContext; diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc index 7257ddc..d67ed98 100644 --- a/extensions/browser/image_loader_unittest.cc +++ b/extensions/browser/image_loader_unittest.cc @@ -22,10 +22,10 @@ #include "extensions/common/manifest_handlers/icons_handler.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.h" #include "ui/gfx/image/image_family.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" using content::BrowserThread; using content::NotificationService; diff --git a/extensions/common/extension.h b/extensions/common/extension.h index a1509da..1e1e52c 100644 --- a/extensions/common/extension.h +++ b/extensions/common/extension.h @@ -25,7 +25,7 @@ #include "extensions/common/manifest.h" #include "extensions/common/url_pattern_set.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" #if !defined(ENABLE_EXTENSIONS) diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc index c8e01d4..8535d9b 100644 --- a/extensions/common/manifest_handlers/icons_handler.cc +++ b/extensions/common/manifest_handlers/icons_handler.cc @@ -16,7 +16,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handler_helpers.h" #include "grit/extensions_strings.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace extensions { diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc index 015a2a7..0f15f1d 100644 --- a/gpu/command_buffer/client/gl_in_process_context.cc +++ b/gpu/command_buffer/client/gl_in_process_context.cc @@ -26,7 +26,7 @@ #include "gpu/command_buffer/client/transfer_buffer.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/constants.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_image.h" #if defined(OS_ANDROID) diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h index 670ce75..0092a9a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder.h @@ -16,7 +16,7 @@ #include "gpu/command_buffer/common/capabilities.h" #include "gpu/command_buffer/service/common_decoder.h" #include "gpu/command_buffer/service/logger.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_context.h" namespace gfx { diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h index 4428a403..35ff4c1 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h @@ -9,11 +9,11 @@ #include <vector> +#include "base/callback_forward.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "base/callback_forward.h" #include "testing/gmock/include/gmock/gmock.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace gfx { class GLContext; diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc index d43f84c..c312345 100644 --- a/gpu/command_buffer/service/in_process_command_buffer.cc +++ b/gpu/command_buffer/service/in_process_command_buffer.cc @@ -33,7 +33,7 @@ #include "gpu/command_buffer/service/query_manager.h" #include "gpu/command_buffer/service/transfer_buffer_manager.h" #include "gpu/command_buffer/service/valuebuffer_manager.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_image.h" #include "ui/gl/gl_share_group.h" diff --git a/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc b/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc index 1026f45..621e6a1 100644 --- a/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc +++ b/gpu/command_buffer/service/stream_texture_manager_in_process_android.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/android/surface_texture.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_image.h" diff --git a/gpu/command_buffer/tests/gl_manager.h b/gpu/command_buffer/tests/gl_manager.h index 7a3eb2c..cad1469 100644 --- a/gpu/command_buffer/tests/gl_manager.h +++ b/gpu/command_buffer/tests/gl_manager.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gpu_control.h" #include "gpu/command_buffer/service/feature_info.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/size.h" namespace base { class CommandLine; diff --git a/media/base/android/demuxer_stream_player_params.h b/media/base/android/demuxer_stream_player_params.h index 0b8886e..be759c3 100644 --- a/media/base/android/demuxer_stream_player_params.h +++ b/media/base/android/demuxer_stream_player_params.h @@ -12,7 +12,7 @@ #include "media/base/demuxer_stream.h" #include "media/base/media_export.h" #include "media/base/video_decoder_config.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h index d62300a..c09ea52 100644 --- a/media/base/android/media_codec_bridge.h +++ b/media/base/android/media_codec_bridge.h @@ -12,7 +12,7 @@ #include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/video_decoder_config.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 6cbb5e7..46a07da 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -20,7 +20,7 @@ #include "media/base/serial_runner.h" #include "media/base/text_track.h" #include "media/base/video_rotation.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class SingleThreadTaskRunner; diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 0a09a33..b5e91bd 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -20,7 +20,7 @@ #include "media/base/text_track_config.h" #include "media/base/time_delta_interpolator.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using ::testing::_; using ::testing::AnyNumber; diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index 810e086..3401a09 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h @@ -12,7 +12,7 @@ #include "media/base/sample_format.h" #include "media/base/video_decoder_config.h" #include "testing/gmock/include/gmock/gmock.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoop; diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h index 52aa867..d7e7a79 100644 --- a/media/base/video_decoder.h +++ b/media/base/video_decoder.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "media/base/media_export.h" #include "media/base/pipeline_status.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 66acc84..356b467 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -12,7 +12,7 @@ #include "media/base/media_export.h" #include "media/base/video_frame.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 93cc4f7b..15ee62b 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -13,7 +13,7 @@ #include "base/synchronization/lock.h" #include "media/base/buffers.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_MACOSX) #include <CoreVideo/CVPixelBuffer.h> diff --git a/media/base/video_util.h b/media/base/video_util.h index dfbe1ad..7798ebe 100644 --- a/media/base/video_util.h +++ b/media/base/video_util.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/blink/video_frame_compositor.h b/media/blink/video_frame_compositor.h index f8bdd1e..9e46663e 100644 --- a/media/blink/video_frame_compositor.h +++ b/media/blink/video_frame_compositor.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "cc/layers/video_frame_provider.h" #include "media/base/media_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class VideoFrame; diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index e536c3e..dceda52 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -18,7 +18,7 @@ #define VPX_CODEC_DISABLE_COMPAT 1 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc index 918f7bb..2742c05 100644 --- a/media/cast/test/fake_media_source.cc +++ b/media/cast/test/fake_media_source.cc @@ -26,7 +26,7 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_glue.h" #include "media/filters/in_memory_url_protocol.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/media/cast/test/linux_output_window.cc b/media/cast/test/linux_output_window.cc index 389bb0f..5a934aa 100644 --- a/media/cast/test/linux_output_window.cc +++ b/media/cast/test/linux_output_window.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "media/base/video_frame.h" #include "third_party/libyuv/include/libyuv/convert.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/cast/test/utility/video_utility.cc b/media/cast/test/utility/video_utility.cc index ed72c89..9741cd0 100644 --- a/media/cast/test/utility/video_utility.cc +++ b/media/cast/test/utility/video_utility.cc @@ -9,7 +9,7 @@ #include "base/rand_util.h" #include "third_party/libyuv/include/libyuv/compare.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace cast { diff --git a/media/filters/fake_demuxer_stream.cc b/media/filters/fake_demuxer_stream.cc index b8bf526..aaffa51 100644 --- a/media/filters/fake_demuxer_stream.cc +++ b/media/filters/fake_demuxer_stream.cc @@ -14,7 +14,7 @@ #include "media/base/test_helpers.h" #include "media/base/video_frame.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 5139e75..bf407b9 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -18,7 +18,7 @@ #include "media/base/video_decoder.h" #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using base::ResetAndReturn; diff --git a/media/formats/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc index a868401..8a50950 100644 --- a/media/formats/mp2t/es_parser_h264.cc +++ b/media/formats/mp2t/es_parser_h264.cc @@ -15,7 +15,7 @@ #include "media/formats/mp2t/es_adapter_video.h" #include "media/formats/mp2t/mp2t_common.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { namespace mp2t { diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index b2d73dc..a652eea 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace media { diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h index fbda94b..11213c3 100644 --- a/media/tools/player_x11/x11_video_renderer.h +++ b/media/tools/player_x11/x11_video_renderer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class VideoFrame; diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm index 6be9c51..ea72cf0 100644 --- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm +++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/mac/foundation_util.h" #include "media/video/capture/mac/video_capture_device_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation VideoCaptureDeviceAVFoundation diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm index 65103e5..8e64119 100644 --- a/media/video/capture/mac/video_capture_device_mac.mm +++ b/media/video/capture/mac/video_capture_device_mac.mm @@ -11,16 +11,16 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/message_loop/message_loop_proxy.h" #include "base/mac/scoped_ioobject.h" #include "base/mac/scoped_ioplugininterface.h" +#include "base/message_loop/message_loop_proxy.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #import "media/base/mac/avfoundation_glue.h" #import "media/video/capture/mac/platform_video_capturing_mac.h" #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h" #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation DeviceNameAndTransportType diff --git a/media/video/capture/mac/video_capture_device_qtkit_mac.mm b/media/video/capture/mac/video_capture_device_qtkit_mac.mm index 09622e4..126439e1d 100644 --- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm +++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm @@ -12,7 +12,7 @@ #include "media/video/capture/mac/video_capture_device_mac.h" #include "media/video/capture/video_capture_device.h" #include "media/video/capture/video_capture_types.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" @implementation VideoCaptureDeviceQTKit diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h index eee4301..f8e8cab 100644 --- a/media/video/capture/video_capture_types.h +++ b/media/video/capture/video_capture_types.h @@ -8,7 +8,7 @@ #include <vector> #include "media/base/media_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/video/picture.h b/media/video/picture.h index 844e629..ec508ac 100644 --- a/media/video/picture.h +++ b/media/video/picture.h @@ -9,7 +9,7 @@ #include "gpu/command_buffer/common/mailbox.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 547e1bb..a796bdb 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -11,7 +11,7 @@ #include "media/base/bitstream_buffer.h" #include "media/base/video_decoder_config.h" #include "media/video/picture.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" typedef unsigned int GLenum; diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 9b57576..55b8786 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -17,7 +17,7 @@ #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc index 6082abe..247da12 100644 --- a/printing/emf_win_unittest.cc +++ b/printing/emf_win_unittest.cc @@ -20,7 +20,7 @@ #include "printing/printing_context.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace printing { diff --git a/printing/image.h b/printing/image.h index b40657a..c5a609e 100644 --- a/printing/image.h +++ b/printing/image.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "printing/printing_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class FilePath; diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc index 3c4680f10..d9d97c8 100644 --- a/printing/pdf_metafile_cg_mac.cc +++ b/printing/pdf_metafile_cg_mac.cc @@ -14,7 +14,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/threading/thread_local.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using base::ScopedCFTypeRef; diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index 3f9dfef..7f640ad 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc @@ -20,7 +20,7 @@ #include "third_party/skia/include/pdf/SkPDFDocument.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(OS_MACOSX) #include "printing/pdf_metafile_cg_mac.h" diff --git a/printing/printed_page.h b/printing/printed_page.h index 28fa5cc..aa94b61 100644 --- a/printing/printed_page.h +++ b/printing/printed_page.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "printing/metafile.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace printing { diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index 6f88d73..8f6d756 100644 --- a/skia/ext/image_operations_unittest.cc +++ b/skia/ext/image_operations_unittest.cc @@ -16,7 +16,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace { diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index a52c7b6..d3ad9a0 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -19,7 +19,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/effects/SkDashPathEffect.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace skia { 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; diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index e93c393..3bf38f8 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -21,7 +21,7 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_implementation.h" using gpu::gles2::GLES2Implementation; |