Use a direct include of time headers in ui/.

BUG=254986
TEST=none
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/18149004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209153 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 15 insertions, 15 deletions

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"