diff options
Diffstat (limited to 'content')
16 files changed, 16 insertions, 16 deletions
diff --git a/content/browser/android/in_process/synchronous_input_event_filter.cc b/content/browser/android/in_process/synchronous_input_event_filter.cc index 34144da..17c909d 100644 --- a/content/browser/android/in_process/synchronous_input_event_filter.cc +++ b/content/browser/android/in_process/synchronous_input_event_filter.cc @@ -8,7 +8,7 @@ #include "cc/input/input_handler.h" #include "content/browser/android/in_process/synchronous_compositor_impl.h" #include "content/public/browser/browser_thread.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" using WebKit::WebInputEvent; diff --git a/content/browser/aura/software_browser_compositor_output_surface.cc b/content/browser/aura/software_browser_compositor_output_surface.cc index 1f92582..c59806e 100644 --- a/content/browser/aura/software_browser_compositor_output_surface.cc +++ b/content/browser/aura/software_browser_compositor_output_surface.cc @@ -8,7 +8,7 @@ #include "cc/output/compositor_frame.h" #include "cc/output/software_output_device.h" #include "content/browser/renderer_host/render_widget_host_impl.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" namespace content { diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 0482b347e8..fda9cbd 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -36,7 +36,7 @@ #include "gpu/command_buffer/service/gpu_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gl/gl_switches.h" diff --git a/content/browser/renderer_host/compositing_iosurface_mac.h b/content/browser/renderer_host/compositing_iosurface_mac.h index 623272b..674e4e5 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.h +++ b/content/browser/renderer_host/compositing_iosurface_mac.h @@ -19,7 +19,7 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "media/base/video_frame.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_conversions.h" diff --git a/content/browser/renderer_host/input/input_queue_unittest.cc b/content/browser/renderer_host/input/input_queue_unittest.cc index 2d183d9..ec66f2a 100644 --- a/content/browser/renderer_host/input/input_queue_unittest.cc +++ b/content/browser/renderer_host/input/input_queue_unittest.cc @@ -14,7 +14,7 @@ #include "content/common/input/web_input_event_payload.h" #include "content/common/input_messages.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" namespace content { namespace { diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 613177c..11a557d 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -35,7 +35,7 @@ #include "ipc/ipc_listener.h" #include "ui/base/ime/text_input_mode.h" #include "ui/base/ime/text_input_type.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" class WebCursor; diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h index ef56f26..b99a331 100644 --- a/content/common/content_param_traits_macros.h +++ b/content/common/content_param_traits_macros.h @@ -11,7 +11,7 @@ #include "content/common/content_export.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "webkit/common/resource_type.h" #undef IPC_MESSAGE_EXPORT diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h index a3f6260..04f826d 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.h +++ b/content/common/gpu/client/command_buffer_proxy_impl.h @@ -24,7 +24,7 @@ #include "gpu/command_buffer/common/command_buffer_shared.h" #include "ipc/ipc_listener.h" #include "media/video/video_decode_accelerator.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" struct GPUCommandBufferConsoleMessage; diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index 7414b26..292c20b 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -23,7 +23,7 @@ #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "media/base/video_decoder_config.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/gl/gl_surface.h" diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index b4e5be5..49a2650 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -27,7 +27,7 @@ #include "media/base/video_frame.h" #include "media/video/video_decode_accelerator.h" #include "media/video/video_encode_accelerator.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/gl/gpu_preference.h" diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index 9a7889f..7b2d11d 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -15,7 +15,7 @@ #include "content/common/content_export.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/content/common/input/web_input_event_payload.h b/content/common/input/web_input_event_payload.h index 4d35b16..9857a5a 100644 --- a/content/common/input/web_input_event_payload.h +++ b/content/common/input/web_input_event_payload.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" #include "content/common/input/input_event.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" namespace WebKit { class WebInputEvent; diff --git a/content/common/input_messages.h b/content/common/input_messages.h index 5d2e3ed..5e6dd25 100644 --- a/content/common/input_messages.h +++ b/content/common/input_messages.h @@ -19,7 +19,7 @@ #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/content/port/browser/event_with_latency_info.h b/content/port/browser/event_with_latency_info.h index a39ae52..70788f9 100644 --- a/content/port/browser/event_with_latency_info.h +++ b/content/port/browser/event_with_latency_info.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PORT_BROWSER_EVENT_WITH_LATENCY_INFO_H_ #define CONTENT_PORT_BROWSER_EVENT_WITH_LATENCY_INFO_H_ -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" namespace WebKit { class WebGestureEvent; diff --git a/content/renderer/gpu/input_handler_proxy.cc b/content/renderer/gpu/input_handler_proxy.cc index f1ca2a5..1f88e62 100644 --- a/content/renderer/gpu/input_handler_proxy.cc +++ b/content/renderer/gpu/input_handler_proxy.cc @@ -10,7 +10,7 @@ #include "content/renderer/gpu/input_handler_proxy_client.h" #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" using WebKit::WebFloatPoint; using WebKit::WebFloatSize; diff --git a/content/renderer/gpu/input_handler_proxy_unittest.cc b/content/renderer/gpu/input_handler_proxy_unittest.cc index 4c74513..3e8b8c8 100644 --- a/content/renderer/gpu/input_handler_proxy_unittest.cc +++ b/content/renderer/gpu/input_handler_proxy_unittest.cc @@ -14,7 +14,7 @@ #include "third_party/WebKit/public/platform/WebGestureCurve.h" #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/events/latency_info.h" +#include "ui/base/latency_info.h" using WebKit::WebActiveWheelFlingParameters; using WebKit::WebFloatPoint; |