diff options
33 files changed, 33 insertions, 33 deletions
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h index e595ad0..e450f15 100644 --- a/cc/animation/layer_animation_controller.h +++ b/cc/animation/layer_animation_controller.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/animation/layer_animation_event_observer.h" #include "cc/base/cc_export.h" diff --git a/cc/animation/scrollbar_animation_controller.h b/cc/animation/scrollbar_animation_controller.h index aa106cf..55d2945 100644 --- a/cc/animation/scrollbar_animation_controller.h +++ b/cc/animation/scrollbar_animation_controller.h @@ -5,7 +5,7 @@ #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_H_ #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "ui/gfx/vector2d_f.h" diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc index e22207d..5382712 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade.cc +++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc @@ -4,7 +4,7 @@ #include "cc/animation/scrollbar_animation_controller_linear_fade.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/layers/layer_impl.h" namespace cc { diff --git a/cc/debug/frame_rate_counter.h b/cc/debug/frame_rate_counter.h index 24d4926..32b4c2c 100644 --- a/cc/debug/frame_rate_counter.h +++ b/cc/debug/frame_rate_counter.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/ring_buffer.h" namespace cc { diff --git a/cc/debug/paint_time_counter.h b/cc/debug/paint_time_counter.h index 1ad3a29..8d109d0 100644 --- a/cc/debug/paint_time_counter.h +++ b/cc/debug/paint_time_counter.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/ring_buffer.h" namespace cc { diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h index 1007df6..eb01a57 100644 --- a/cc/debug/rendering_stats.h +++ b/cc/debug/rendering_stats.h @@ -6,7 +6,7 @@ #define CC_DEBUG_RENDERING_STATS_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" namespace cc { diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index 89e8ec3..f8bb6f3 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h @@ -6,7 +6,7 @@ #define CC_INPUT_INPUT_HANDLER_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/input/scrollbar.h" diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc index 1eaedc6..925830c 100644 --- a/cc/input/top_controls_manager.cc +++ b/cc/input/top_controls_manager.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/keyframed_animation_curve.h" #include "cc/animation/timing_function.h" #include "cc/input/top_controls_manager_client.h" diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc index 4fb1bef..da7475f 100644 --- a/cc/input/top_controls_manager_unittest.cc +++ b/cc/input/top_controls_manager_unittest.cc @@ -5,7 +5,7 @@ #include "cc/input/top_controls_manager.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/input/top_controls_manager_client.h" #include "cc/layers/layer_impl.h" #include "cc/test/fake_impl_proxy.h" diff --git a/cc/layers/content_layer.cc b/cc/layers/content_layer.cc index e88223f..19db897 100644 --- a/cc/layers/content_layer.cc +++ b/cc/layers/content_layer.cc @@ -6,7 +6,7 @@ #include "base/auto_reset.h" #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/layers/content_layer_client.h" #include "cc/resources/bitmap_content_layer_updater.h" #include "cc/resources/bitmap_skpicture_content_layer_updater.h" diff --git a/cc/layers/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h index 28202d4..32bf77e 100644 --- a/cc/layers/heads_up_display_layer_impl.h +++ b/cc/layers/heads_up_display_layer_impl.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" #include "cc/resources/memory_history.h" diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 5edf6f8..469f9c5 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/math_util.h" #include "cc/base/util.h" #include "cc/debug/debug_colors.h" diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h index 33304cb..22693db 100644 --- a/cc/output/begin_frame_args.h +++ b/cc/output/begin_frame_args.h @@ -5,7 +5,7 @@ #ifndef CC_OUTPUT_BEGIN_FRAME_ARGS_H_ #define CC_OUTPUT_BEGIN_FRAME_ARGS_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" namespace cc { diff --git a/cc/output/output_surface_client.h b/cc/output/output_surface_client.h index fe669cb..4816ac7 100644 --- a/cc/output/output_surface_client.h +++ b/cc/output/output_surface_client.h @@ -6,7 +6,7 @@ #define CC_OUTPUT_OUTPUT_SURFACE_CLIENT_H_ #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/output/context_provider.h" diff --git a/cc/resources/bitmap_skpicture_content_layer_updater.cc b/cc/resources/bitmap_skpicture_content_layer_updater.cc index 9661da5..2c00099 100644 --- a/cc/resources/bitmap_skpicture_content_layer_updater.cc +++ b/cc/resources/bitmap_skpicture_content_layer_updater.cc @@ -4,7 +4,7 @@ #include "cc/resources/bitmap_skpicture_content_layer_updater.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/resources/layer_painter.h" #include "cc/resources/prioritized_resource.h" diff --git a/cc/resources/content_layer_updater.cc b/cc/resources/content_layer_updater.cc index d15f02a..c9c2ecc 100644 --- a/cc/resources/content_layer_updater.cc +++ b/cc/resources/content_layer_updater.cc @@ -5,7 +5,7 @@ #include "cc/resources/content_layer_updater.h" #include "base/debug/trace_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/resources/layer_painter.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/cc/resources/memory_history.h b/cc/resources/memory_history.h index 43762bc..daca10f 100644 --- a/cc/resources/memory_history.h +++ b/cc/resources/memory_history.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/ring_buffer.h" namespace cc { diff --git a/cc/resources/picture_pile_impl.h b/cc/resources/picture_pile_impl.h index 23011d9..c6c3ab3f 100644 --- a/cc/resources/picture_pile_impl.h +++ b/cc/resources/picture_pile_impl.h @@ -9,7 +9,7 @@ #include <map> #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/resources/picture_pile_base.h" #include "skia/ext/analysis_canvas.h" diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc index 866daa8..c2470c2 100644 --- a/cc/resources/raster_worker_pool_perftest.cc +++ b/cc/resources/raster_worker_pool_perftest.cc @@ -4,7 +4,7 @@ #include "cc/resources/raster_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc { diff --git a/cc/resources/resource_update_controller.h b/cc/resources/resource_update_controller.h index b9fbfe1..97138bc 100644 --- a/cc/resources/resource_update_controller.h +++ b/cc/resources/resource_update_controller.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/resources/resource_update_queue.h" diff --git a/cc/resources/worker_pool_perftest.cc b/cc/resources/worker_pool_perftest.cc index c32a59b..d708cf5 100644 --- a/cc/resources/worker_pool_perftest.cc +++ b/cc/resources/worker_pool_perftest.cc @@ -4,7 +4,7 @@ #include "cc/resources/worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/completion_event.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/scheduler/frame_rate_controller.h b/cc/scheduler/frame_rate_controller.h index 0cfca0f..ed76923 100644 --- a/cc/scheduler/frame_rate_controller.h +++ b/cc/scheduler/frame_rate_controller.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" diff --git a/cc/scheduler/rolling_time_delta_history.h b/cc/scheduler/rolling_time_delta_history.h index 947fb98..b79862d 100644 --- a/cc/scheduler/rolling_time_delta_history.h +++ b/cc/scheduler/rolling_time_delta_history.h @@ -8,7 +8,7 @@ #include <deque> #include <set> -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" namespace cc { diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h index 93d5b4e..710aec4 100644 --- a/cc/scheduler/scheduler.h +++ b/cc/scheduler/scheduler.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/scheduler/scheduler_settings.h" diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h index 3784f6f..325ac1c 100644 --- a/cc/scheduler/scheduler_state_machine.h +++ b/cc/scheduler/scheduler_state_machine.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/scheduler/scheduler_settings.h" diff --git a/cc/scheduler/time_source.h b/cc/scheduler/time_source.h index 1402737..c02d490 100644 --- a/cc/scheduler/time_source.h +++ b/cc/scheduler/time_source.h @@ -6,7 +6,7 @@ #define CC_SCHEDULER_TIME_SOURCE_H_ #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/cc_export.h" namespace cc { diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h index 13b12ea..95814b8 100644 --- a/cc/test/fake_output_surface.h +++ b/cc/test/fake_output_surface.h @@ -5,7 +5,7 @@ #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_ #define CC_TEST_FAKE_OUTPUT_SURFACE_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/output/begin_frame_args.h" #include "cc/output/compositor_frame.h" #include "cc/output/output_surface.h" diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h index ad8927d..4236fff 100644 --- a/cc/test/scheduler_test_common.h +++ b/cc/test/scheduler_test_common.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/scheduler/delay_based_time_source.h" #include "cc/scheduler/frame_rate_controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index b3d004a..0cd37a6 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/base/cc_export.h" #include "cc/base/scoped_ptr_vector.h" diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index ef7edd5..7bb59d2 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/animation/animation_registrar.h" #include "cc/base/cc_export.h" diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h index 38cdbc7..098c270 100644 --- a/cc/trees/proxy.h +++ b/cc/trees/proxy.h @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "cc/base/cc_export.h" #include "skia/ext/refptr.h" diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h index 0ed3798..af52b6d 100644 --- a/cc/trees/single_thread_proxy.h +++ b/cc/trees/single_thread_proxy.h @@ -7,7 +7,7 @@ #include <limits> -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/output/begin_frame_args.h" #include "cc/trees/layer_tree_host_impl.h" diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h index 94fcee5..544ef87 100644 --- a/cc/trees/thread_proxy.h +++ b/cc/trees/thread_proxy.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_events.h" #include "cc/base/completion_event.h" #include "cc/resources/resource_update_controller.h" |