diff options
Diffstat (limited to 'chrome/common')
22 files changed, 29 insertions, 29 deletions
diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index 7a9ba91..8bc8153 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -14,8 +14,8 @@ #include "chrome/common/page_type.h" #include "chrome/common/security_style.h" #include "chrome/common/common_param_traits.h" -#include "gfx/rect.h" #include "net/base/upload_data.h" +#include "ui/gfx/rect.h" struct AutomationMsg_Find_Params { // Unused value, which exists only for backwards compat. diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 790afda..f3abe90 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -11,10 +11,10 @@ #include "chrome/common/content_settings.h" #include "chrome/common/navigation_types.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "net/url_request/url_request_status.h" +#include "ui/gfx/rect.h" diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index 6ad3dbe..21746b0 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -5,11 +5,11 @@ #include "chrome/common/badge_util.h" #include "base/utf_string_conversions.h" -#include "gfx/canvas_skia.h" -#include "gfx/font.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkTypeface.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/font.h" namespace badge_util { diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc index 2b90741..64fa35c9 100644 --- a/chrome/common/common_param_traits.cc +++ b/chrome/common/common_param_traits.cc @@ -10,12 +10,12 @@ #include "chrome/common/geoposition.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/web_apps.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "net/base/upload_data.h" #include "printing/backend/print_backend.h" #include "printing/native_metafile.h" #include "printing/page_range.h" +#include "ui/gfx/rect.h" #ifndef EXCLUDE_SKIA_DEPENDENCIES #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h index 7b6ed40..f1e8cb0 100644 --- a/chrome/common/common_param_traits.h +++ b/chrome/common/common_param_traits.h @@ -18,7 +18,6 @@ #include "base/ref_counted.h" #include "chrome/common/content_settings.h" #include "chrome/common/page_zoom.h" -#include "gfx/native_widget_types.h" #include "ipc/ipc_message_utils.h" #include "net/url_request/url_request_status.h" #include "printing/native_metafile.h" @@ -30,6 +29,7 @@ // // TODO(erg): The following two headers are historical and only work because // their definitions are inlined, which also needs to be fixed. +#include "ui/gfx/native_widget_types.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc index 3e4311c..a11ddd1 100644 --- a/chrome/common/common_param_traits_unittest.cc +++ b/chrome/common/common_param_traits_unittest.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/common/common_param_traits.h" #include "chrome/common/geoposition.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h" @@ -18,6 +17,7 @@ #include "printing/page_range.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/rect.h" // Tests that serialize/deserialize correctly understand each other TEST(IPCMessageTest, Serialize) { diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index eba6ed3..6074085 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -20,8 +20,8 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/extensions/url_pattern.h" -#include "gfx/size.h" #include "googleurl/src/gurl.h" +#include "ui/gfx/size.h" class DictionaryValue; class ExtensionAction; diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index ce6f821..0cb4a0f 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -8,13 +8,13 @@ #include "base/logging.h" #include "chrome/common/badge_util.h" -#include "gfx/canvas_skia.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/common/extensions/extension_action_unittest.cc b/chrome/common/extensions/extension_action_unittest.cc index 4413bfe..b9588bf 100644 --- a/chrome/common/extensions/extension_action_unittest.cc +++ b/chrome/common/extensions/extension_action_unittest.cc @@ -7,10 +7,10 @@ #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_action.h" -#include "gfx/skia_util.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/skia_util.h" #include "webkit/glue/image_decoder.h" using gfx::BitmapsAreEqual; diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 5ee3a06..817062c 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -23,7 +23,6 @@ #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" -#include "gfx/codec/png_codec.h" #include "googleurl/src/gurl.h" #include "net/base/mime_sniffer.h" #include "skia/ext/image_operations.h" @@ -32,6 +31,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/codec/png_codec.h" namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; diff --git a/chrome/common/gpu_messages.cc b/chrome/common/gpu_messages.cc index 5e0bace..b46babe 100644 --- a/chrome/common/gpu_messages.cc +++ b/chrome/common/gpu_messages.cc @@ -7,9 +7,9 @@ #include "chrome/common/gpu_create_command_buffer_config.h" #include "chrome/common/gpu_info.h" #include "chrome/common/dx_diag_node.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "ipc/ipc_channel_handle.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #define IPC_MESSAGE_IMPL #include "chrome/common/gpu_messages.h" diff --git a/chrome/common/gpu_messages.h b/chrome/common/gpu_messages.h index 387d2b1..2e89a25 100644 --- a/chrome/common/gpu_messages.h +++ b/chrome/common/gpu_messages.h @@ -10,8 +10,8 @@ #include "base/process.h" #include "chrome/common/common_param_traits.h" #include "chrome/common/gpu_param_traits.h" -#include "gfx/native_widget_types.h" #include "gpu/command_buffer/common/command_buffer.h" +#include "ui/gfx/native_widget_types.h" #include "chrome/common/gpu_messages_internal.h" diff --git a/chrome/common/gpu_param_traits.h b/chrome/common/gpu_param_traits.h index 6b35294..1c1c9c0 100644 --- a/chrome/common/gpu_param_traits.h +++ b/chrome/common/gpu_param_traits.h @@ -12,11 +12,11 @@ #include "chrome/common/dx_diag_node.h" #include "chrome/common/gpu_create_command_buffer_config.h" #include "chrome/common/gpu_info.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "gpu/ipc/gpu_command_buffer_traits.h" #include "gpu/command_buffer/common/command_buffer.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #if defined(OS_MACOSX) // Parameters for the GpuHostMsg_AcceleratedSurfaceSetIOSurface diff --git a/chrome/common/native_window_notification_source.h b/chrome/common/native_window_notification_source.h index a8e5cae..240820e 100644 --- a/chrome/common/native_window_notification_source.h +++ b/chrome/common/native_window_notification_source.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/common/notification_source.h" -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" // Specialization of the Source class for native windows. On Windows, these are // HWNDs rather than pointers, and since the Source class expects a pointer diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h index f7c4096..721312d 100644 --- a/chrome/common/plugin_messages.h +++ b/chrome/common/plugin_messages.h @@ -18,13 +18,13 @@ #include "base/string_number_conversions.h" #include "chrome/common/common_param_traits.h" #include "chrome/common/webkit_param_traits.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_utils.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" #include "webkit/glue/npruntime_util.h" // Name prefix of the event handle when a message box is displayed. diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h index e87ee0b..98ed543 100644 --- a/chrome/common/plugin_messages_internal.h +++ b/chrome/common/plugin_messages_internal.h @@ -4,8 +4,8 @@ #include "base/shared_memory.h" #include "build/build_config.h" -#include "gfx/native_widget_types.h" #include "ipc/ipc_message_macros.h" +#include "ui/gfx/native_widget_types.h" #include "webkit/glue/webcursor.h" #if defined(OS_POSIX) diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc index 28d8f90..be6b6dc 100644 --- a/chrome/common/render_messages.cc +++ b/chrome/common/render_messages.cc @@ -11,13 +11,13 @@ #include "chrome/common/resource_response.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/web_apps.h" -#include "gfx/rect.h" #include "ipc/ipc_channel_handle.h" #include "media/audio/audio_buffers_state.h" #include "net/base/upload_data.h" #include "net/http/http_response_headers.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/rect.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/blob/blob_data.h" #include "webkit/glue/resource_loader_bridge.h" diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index ce4b18c..2bc093e 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -25,12 +25,12 @@ #include "chrome/common/renderer_preferences.h" #include "chrome/common/serialized_script_value.h" #include "chrome/common/window_container_type.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_param_traits.h" #include "media/audio/audio_parameters.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/password_form.h" #include "webkit/glue/resource_type.h" #include "webkit/glue/webaccessibility.h" diff --git a/chrome/common/speech_input_messages.h b/chrome/common/speech_input_messages.h index 2a856e5..c46ac02 100644 --- a/chrome/common/speech_input_messages.h +++ b/chrome/common/speech_input_messages.h @@ -7,9 +7,9 @@ #pragma once #include "chrome/common/speech_input_result.h" -#include "gfx/rect.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" +#include "ui/gfx/rect.h" #define IPC_MESSAGE_START SpeechInputMsgStart diff --git a/chrome/common/utility_messages_internal.h b/chrome/common/utility_messages_internal.h index 802be15..11e07f22 100644 --- a/chrome/common/utility_messages_internal.h +++ b/chrome/common/utility_messages_internal.h @@ -6,11 +6,11 @@ #include <vector> #include "base/platform_file.h" -#include "gfx/rect.h" #include "ipc/ipc_message_macros.h" #include "printing/backend/print_backend.h" #include "printing/page_range.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/rect.h" #define IPC_MESSAGE_START UtilityMsgStart diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index f178b4c..47682fa 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -14,7 +14,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/json_schema_validator.h" -#include "gfx/size.h" #include "googleurl/src/gurl.h" #include "grit/common_resources.h" #include "grit/generated_resources.h" @@ -27,6 +26,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/size.h" #include "webkit/glue/dom_operations.h" using WebKit::WebDocument; diff --git a/chrome/common/web_apps.h b/chrome/common/web_apps.h index 91f2023..7e7c9cb 100644 --- a/chrome/common/web_apps.h +++ b/chrome/common/web_apps.h @@ -11,8 +11,8 @@ #include "base/string16.h" #include "googleurl/src/gurl.h" -#include "gfx/size.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/size.h" namespace WebKit { class WebDocument; |