diff options
65 files changed, 71 insertions, 71 deletions
diff --git a/ui/app_list/pagination_model.h b/ui/app_list/pagination_model.h index f50f114..c694126 100644 --- a/ui/app_list/pagination_model.h +++ b/ui/app_list/pagination_model.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/app_list/app_list_export.h" #include "ui/base/animation/animation_delegate.h" diff --git a/ui/app_list/views/app_list_item_view.h b/ui/app_list/views/app_list_item_view.h index 59c77e8f..3ec25d1 100644 --- a/ui/app_list/views/app_list_item_view.h +++ b/ui/app_list/views/app_list_item_view.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/app_list/app_list_export.h" #include "ui/app_list/app_list_item_model_observer.h" #include "ui/app_list/views/cached_label.h" diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h index 6c7f6c7..0fd7761 100644 --- a/ui/app_list/views/app_list_main_view.h +++ b/ui/app_list/views/app_list_main_view.h @@ -6,7 +6,7 @@ #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_ #include "base/memory/scoped_vector.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/app_list/apps_grid_view_delegate.h" #include "ui/app_list/search_box_view_delegate.h" #include "ui/app_list/search_result_list_view_delegate.h" diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h index d8abac2..4fd838c 100644 --- a/ui/app_list/views/apps_grid_view.h +++ b/ui/app_list/views/apps_grid_view.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/app_list/app_list_export.h" #include "ui/app_list/app_list_model.h" #include "ui/app_list/app_list_model_observer.h" diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc index 8934204..3caa60d 100644 --- a/ui/app_list/views/apps_grid_view_unittest.cc +++ b/ui/app_list/views/apps_grid_view_unittest.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/app_list_item_model.h" #include "ui/app_list/app_list_model.h" diff --git a/ui/app_list/views/pulsing_block_view.h b/ui/app_list/views/pulsing_block_view.h index 86b6739..22bbec2 100644 --- a/ui/app_list/views/pulsing_block_view.h +++ b/ui/app_list/views/pulsing_block_view.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/views/view.h" namespace gfx { diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 81248d7..aee7e79 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_split.h" -#include "base/time.h" +#include "base/time/time.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/core/SkXfermode.h" #include "ui/aura/client/default_capture_client.h" diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index 3878ebb..32d3227 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_vector.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" diff --git a/ui/base/animation/animation.h b/ui/base/animation/animation.h index 0183b7f..361ab15 100644 --- a/ui/base/animation/animation.h +++ b/ui/base/animation/animation.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/animation/animation_container_element.h" namespace gfx { diff --git a/ui/base/animation/animation_container.h b/ui/base/animation/animation_container.h index 89f6392..e1631f0 100644 --- a/ui/base/animation/animation_container.h +++ b/ui/base/animation/animation_container.h @@ -8,8 +8,8 @@ #include <set> #include "base/memory/ref_counted.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/animation/animation_container_element.h b/ui/base/animation/animation_container_element.h index 8c082e6..1afa2b8 100644 --- a/ui/base/animation/animation_container_element.h +++ b/ui/base/animation/animation_container_element.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_ANIMATION_ANIMATION_CONTAINER_ELEMENT_H_ #define UI_BASE_ANIMATION_ANIMATION_CONTAINER_ELEMENT_H_ -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/animation/linear_animation.h b/ui/base/animation/linear_animation.h index 33f9785..307a9fb 100644 --- a/ui/base/animation/linear_animation.h +++ b/ui/base/animation/linear_animation.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_ANIMATION_LINEAR_ANIMATION_H_ #define UI_BASE_ANIMATION_LINEAR_ANIMATION_H_ -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/animation/animation.h" namespace ui { diff --git a/ui/base/animation/slide_animation_unittest.cc b/ui/base/animation/slide_animation_unittest.cc index 0ed77cf..afd32b7 100644 --- a/ui/base/animation/slide_animation_unittest.cc +++ b/ui/base/animation/slide_animation_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/test_animation_delegate.h" diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm index 7dd91b6..1c1a8e3 100644 --- a/ui/base/cocoa/events_mac.mm +++ b/ui/base/cocoa/events_mac.mm @@ -8,7 +8,7 @@ #include "base/event_types.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/events/event_utils.h" #import "ui/base/keycodes/keyboard_code_conversion_mac.h" #include "ui/gfx/point.h" diff --git a/ui/base/events/event.h b/ui/base/events/event.h index b0ce5e0..b9d2e44 100644 --- a/ui/base/events/event.h +++ b/ui/base/events/event.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/event_types.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" diff --git a/ui/base/gestures/gesture_recognizer_impl.cc b/ui/base/gestures/gesture_recognizer_impl.cc index e051b97..fc02137 100644 --- a/ui/base/gestures/gesture_recognizer_impl.cc +++ b/ui/base/gestures/gesture_recognizer_impl.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/events/event.h" #include "ui/base/events/event_constants.h" #include "ui/base/events/event_utils.h" diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index 6362589..1c67408 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/events/event.h" #include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" diff --git a/ui/base/gestures/gesture_sequence.h b/ui/base/gestures/gesture_sequence.h index 9413570..9aff570 100644 --- a/ui/base/gestures/gesture_sequence.h +++ b/ui/base/gestures/gesture_sequence.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_GESTURES_GESTURE_SEQUENCE_H_ #define UI_BASE_GESTURES_GESTURE_SEQUENCE_H_ -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_point.h" #include "ui/base/gestures/gesture_recognizer.h" diff --git a/ui/base/latency_info.h b/ui/base/latency_info.h index a472570..a5fe13b 100644 --- a/ui/base/latency_info.h +++ b/ui/base/latency_info.h @@ -9,7 +9,7 @@ #include <utility> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/ozone/touch_event_converter_ozone_unittest.cc b/ui/base/ozone/touch_event_converter_ozone_unittest.cc index 88194df..e163180 100644 --- a/ui/base/ozone/touch_event_converter_ozone_unittest.cc +++ b/ui/base/ozone/touch_event_converter_ozone_unittest.cc @@ -14,7 +14,7 @@ #include "base/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/run_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/events/event.h" #include "ui/base/ozone/touch_event_converter_ozone.h" diff --git a/ui/base/touch/touch_factory_x11.h b/ui/base/touch/touch_factory_x11.h index 4c4366c..656a608af 100644 --- a/ui/base/touch/touch_factory_x11.h +++ b/ui/base/touch/touch_factory_x11.h @@ -10,7 +10,7 @@ #include <vector> #include "base/containers/hash_tables.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/base/ui_export.h" template <typename T> struct DefaultSingletonTraits; diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc index 458c8e6..226dd7f 100644 --- a/ui/base/win/events_win.cc +++ b/ui/base/win/events_win.cc @@ -7,7 +7,7 @@ #include "ui/base/events/event_constants.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/win/win_util.h" #include "ui/base/events/event_utils.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 67ee81b..addee73 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -11,7 +11,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/trees/layer_tree_host_client.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/compositor/compositor_export.h" diff --git a/ui/compositor/compositor_observer.h b/ui/compositor/compositor_observer.h index ec93988..aced251 100644 --- a/ui/compositor/compositor_observer.h +++ b/ui/compositor/compositor_observer.h @@ -5,7 +5,7 @@ #ifndef UI_COMPOSITOR_COMPOSITOR_OBSERVER_H_ #define UI_COMPOSITOR_COMPOSITOR_OBSERVER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "ui/compositor/compositor_export.h" namespace ui { diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h index d3d2e1e..0e073aa 100644 --- a/ui/compositor/float_animation_curve_adapter.h +++ b/ui/compositor/float_animation_curve_adapter.h @@ -5,7 +5,7 @@ #ifndef UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_ #define UI_COMPOSITOR_FLOAT_ANIMATION_CURVE_ADAPTER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_curve.h" #include "ui/base/animation/tween.h" diff --git a/ui/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h index 17a4d0e..c5949d3 100644 --- a/ui/compositor/layer_animation_element.h +++ b/ui/compositor/layer_animation_element.h @@ -7,7 +7,7 @@ #include <set> -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation.h" #include "cc/animation/animation_events.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/ui/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc index 529ce0c..a674270 100644 --- a/ui/compositor/layer_animation_element_unittest.cc +++ b/ui/compositor/layer_animation_element_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/test/test_layer_animation_delegate.h" diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h index 2f2e405..838c6b9 100644 --- a/ui/compositor/layer_animation_sequence.h +++ b/ui/compositor/layer_animation_sequence.h @@ -11,7 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc index 29249dd..fe70601 100644 --- a/ui/compositor/layer_animation_sequence_unittest.cc +++ b/ui/compositor/layer_animation_sequence_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 0d183b9..7d6392e 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h @@ -12,7 +12,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/animation/animation_container_element.h" #include "ui/base/animation/tween.h" #include "ui/compositor/compositor_export.h" diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 77d6d1d..8b4d792 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h index 15388e2..7f8e1c7 100644 --- a/ui/compositor/scoped_layer_animation_settings.h +++ b/ui/compositor/scoped_layer_animation_settings.h @@ -7,7 +7,7 @@ #include <set> -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/animation/tween.h" #include "ui/compositor/compositor_export.h" diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h index 56089f3..7b6bdce 100644 --- a/ui/compositor/transform_animation_curve_adapter.h +++ b/ui/compositor/transform_animation_curve_adapter.h @@ -5,7 +5,7 @@ #ifndef UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ #define UI_COMPOSITOR_TRANSFORM_ANIMATION_CURVE_ADAPTER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/animation/animation_curve.h" #include "ui/base/animation/tween.h" #include "ui/gfx/transform.h" diff --git a/ui/gfx/gtk_util.h b/ui/gfx/gtk_util.h index 24d4f04..5fe0c08 100644 --- a/ui/gfx/gtk_util.h +++ b/ui/gfx/gtk_util.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/ui_export.h" typedef struct _GdkPixbuf GdkPixbuf; diff --git a/ui/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index e6a13cb..fcac714 100644 --- a/ui/gl/gl_surface_egl.h +++ b/ui/gl/gl_surface_egl.h @@ -12,7 +12,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/gl/gl_bindings.h" diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 7a5a91e..91fc4e8 100644 --- a/ui/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -19,7 +19,7 @@ extern "C" { #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "third_party/mesa/src/include/GL/osmesa.h" #include "ui/base/x/x11_util.h" #include "ui/gl/gl_bindings.h" diff --git a/ui/gl/vsync_provider.cc b/ui/gl/vsync_provider.cc index b1562cc..064eb94 100644 --- a/ui/gl/vsync_provider.cc +++ b/ui/gl/vsync_provider.cc @@ -7,7 +7,7 @@ #include <math.h> #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" namespace { diff --git a/ui/gl/vsync_provider.h b/ui/gl/vsync_provider.h index bec065e..f76cacc 100644 --- a/ui/gl/vsync_provider.h +++ b/ui/gl/vsync_provider.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" namespace gfx { diff --git a/ui/message_center/cocoa/tray_view_controller.mm b/ui/message_center/cocoa/tray_view_controller.mm index 9e0f9fa..d01f10d 100644 --- a/ui/message_center/cocoa/tray_view_controller.mm +++ b/ui/message_center/cocoa/tray_view_controller.mm @@ -7,7 +7,7 @@ #include <cmath> #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "skia/ext/skia_utils_mac.h" diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h index a30d6c1..412e0b3 100644 --- a/ui/message_center/message_center_impl.h +++ b/ui/message_center/message_center_impl.h @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "base/stl_util.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_observer.h" diff --git a/ui/message_center/notification.h b/ui/message_center/notification.h index d6982da..23e2e8c 100644 --- a/ui/message_center/notification.h +++ b/ui/message_center/notification.h @@ -9,7 +9,7 @@ #include <vector> #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "ui/gfx/image/image.h" #include "ui/message_center/message_center_export.h" diff --git a/ui/message_center/notification_list.cc b/ui/message_center/notification_list.cc index 49f1244..8f1bc9f 100644 --- a/ui/message_center/notification_list.cc +++ b/ui/message_center/notification_list.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/notification.h" diff --git a/ui/message_center/notification_list.h b/ui/message_center/notification_list.h index 4e44aa9..ce24498 100644 --- a/ui/message_center/notification_list.h +++ b/ui/message_center/notification_list.h @@ -9,8 +9,8 @@ #include <string> #include "base/strings/string16.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/gfx/image/image.h" #include "ui/gfx/native_widget_types.h" #include "ui/message_center/message_center_export.h" diff --git a/ui/message_center/views/message_popup_bubble.h b/ui/message_center/views/message_popup_bubble.h index 671c0b6..f849316 100644 --- a/ui/message_center/views/message_popup_bubble.h +++ b/ui/message_center/views/message_popup_bubble.h @@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/message_center/message_center_export.h" #include "ui/message_center/views/message_bubble_base.h" diff --git a/ui/message_center/views/message_popup_collection.cc b/ui/message_center/views/message_popup_collection.cc index c546a61..a04d6bd 100644 --- a/ui/message_center/views/message_popup_collection.cc +++ b/ui/message_center/views/message_popup_collection.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" diff --git a/ui/message_center/views/message_popup_collection.h b/ui/message_center/views/message_popup_collection.h index 0e978b2..66549a9 100644 --- a/ui/message_center/views/message_popup_collection.h +++ b/ui/message_center/views/message_popup_collection.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" //#include "base/run_loop.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/message_center/message_center_export.h" diff --git a/ui/message_center/views/toast_contents_view.cc b/ui/message_center/views/toast_contents_view.cc index 81f387b..6107b09 100644 --- a/ui/message_center/views/toast_contents_view.cc +++ b/ui/message_center/views/toast_contents_view.cc @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" diff --git a/ui/surface/accelerated_surface_transformer_win_unittest.cc b/ui/surface/accelerated_surface_transformer_win_unittest.cc index a2f242c..607e361 100644 --- a/ui/surface/accelerated_surface_transformer_win_unittest.cc +++ b/ui/surface/accelerated_surface_transformer_win_unittest.cc @@ -10,7 +10,7 @@ #include "base/hash.h" #include "base/scoped_native_library.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "media/base/simd/convert_rgb_to_yuv.h" diff --git a/ui/surface/accelerated_surface_win.h b/ui/surface/accelerated_surface_win.h index f2f766e..16dabe7 100644 --- a/ui/surface/accelerated_surface_win.h +++ b/ui/surface/accelerated_surface_win.h @@ -12,7 +12,7 @@ #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/win/scoped_comptr.h" #include "ui/base/latency_info.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h index e33ec18..20cdb83 100644 --- a/ui/views/controls/button/menu_button.h +++ b/ui/views/controls/button/menu_button.h @@ -8,7 +8,7 @@ #include <string> #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/gfx/font.h" #include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index f6c2abd..ca69c14 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -12,7 +12,7 @@ #include "base/i18n/rtl.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/events/event_constants.h" diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index 45f38e5..44caf9b 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h @@ -14,7 +14,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/base/events/event_constants.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h index ec67b14..98ca71e 100644 --- a/ui/views/controls/textfield/native_textfield_views.h +++ b/ui/views/controls/textfield/native_textfield_views.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/base/events/event_constants.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h index 0b5441a..4f16a3c 100644 --- a/ui/views/controls/textfield/textfield.h +++ b/ui/views/controls/textfield/textfield.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/ime/text_input_type.h" diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 75d70fb..25272de 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/throbber.h" -#include "base/time.h" +#include "base/time/time.h" #include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/throbber.h b/ui/views/controls/throbber.h index 27652cf..8ae3895 100644 --- a/ui/views/controls/throbber.h +++ b/ui/views/controls/throbber.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "ui/views/view.h" namespace gfx { diff --git a/ui/views/controls/tree/tree_view_selector.h b/ui/views/controls/tree/tree_view_selector.h index 699f1ab..170ed90 100644 --- a/ui/views/controls/tree/tree_view_selector.h +++ b/ui/views/controls/tree/tree_view_selector.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_SELECTOR_H_ #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/base/ime/text_input_client.h" #include "ui/views/views_export.h" diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc index 0eeaad1..7e3d262 100644 --- a/ui/views/corewm/tooltip_controller.cc +++ b/ui/views/corewm/tooltip_controller.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/strings/string_split.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/env.h" diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index 558334a..cc641d0 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/aura/client/tooltip_client.h" #include "ui/aura/window_observer.h" #include "ui/base/events/event_handler.h" diff --git a/ui/views/corewm/window_animations.cc b/ui/views/corewm/window_animations.cc index 026a108..c78c41d 100644 --- a/ui/views/corewm/window_animations.cc +++ b/ui/views/corewm/window_animations.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/aura/client/animation_host.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" diff --git a/ui/views/corewm/window_animations_unittest.cc b/ui/views/corewm/window_animations_unittest.cc index 1508b25..26fda67 100644 --- a/ui/views/corewm/window_animations_unittest.cc +++ b/ui/views/corewm/window_animations_unittest.cc @@ -4,7 +4,7 @@ #include "ui/views/corewm/window_animations.h" -#include "base/time.h" +#include "base/time/time.h" #include "ui/aura/client/animation_host.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/test_windows.h" diff --git a/ui/views/mouse_watcher.h b/ui/views/mouse_watcher.h index b976cc6..9327fe6 100644 --- a/ui/views/mouse_watcher.h +++ b/ui/views/mouse_watcher.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 "ui/gfx/insets.h" #include "ui/views/views_export.h" diff --git a/ui/views/repeat_controller.h b/ui/views/repeat_controller.h index 26fda6f..3a93ea5 100644 --- a/ui/views/repeat_controller.h +++ b/ui/views/repeat_controller.h @@ -6,7 +6,7 @@ #define UI_VIEWS_REPEAT_CONTROLLER_H_ #include "base/callback.h" -#include "base/timer.h" +#include "base/timer/timer.h" namespace views { diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 43f8ae9..97cef9d 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -4,7 +4,7 @@ #include "ui/views/touchui/touch_selection_controller_impl.h" -#include "base/time.h" +#include "base/time/time.h" #include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index c42f778..3745330 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h @@ -5,7 +5,7 @@ #ifndef UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_ #define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_ -#include "base/timer.h" +#include "base/timer/timer.h" #include "ui/base/touch/touch_editing_controller.h" #include "ui/gfx/point.h" #include "ui/views/touchui/touch_editing_menu.h" |