summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 02:12:20 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 02:12:20 +0000
commitbbd8da9f17b6b242274a7413f1a70e0b7fd84143 (patch)
treee561728394e0fd38ab71b90acf24f315456f6c8c /chromeos
parentd6c045f13d78f3cffe021dad6e8f44b519179aa8 (diff)
downloadchromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.zip
chromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.tar.gz
chromium_src-bbd8da9f17b6b242274a7413f1a70e0b7fd84143.tar.bz2
Use a direct include of time headers in chrome_frame/, chromeos/, cloud_print/, components/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/18054007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/fake_bluetooth_adapter_client.cc2
-rw-r--r--chromeos/dbus/fake_bluetooth_device_client.cc2
-rw-r--r--chromeos/dbus/power_manager_client.cc4
-rw-r--r--chromeos/dbus/power_manager_client.h2
-rw-r--r--chromeos/display/output_configurator.cc2
-rw-r--r--chromeos/display/output_configurator.h4
-rw-r--r--chromeos/memory/low_memory_listener.cc4
-rw-r--r--chromeos/network/geolocation_handler.h2
-rw-r--r--chromeos/network/network_event_log.h2
-rw-r--r--chromeos/network/network_util.h2
10 files changed, 13 insertions, 13 deletions
diff --git a/chromeos/dbus/fake_bluetooth_adapter_client.cc b/chromeos/dbus/fake_bluetooth_adapter_client.cc
index 695ccdf..dc11c50 100644
--- a/chromeos/dbus/fake_bluetooth_adapter_client.cc
+++ b/chromeos/dbus/fake_bluetooth_adapter_client.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_bluetooth_device_client.h"
#include "dbus/object_path.h"
diff --git a/chromeos/dbus/fake_bluetooth_device_client.cc b/chromeos/dbus/fake_bluetooth_device_client.cc
index ed37c2f..7f6febb 100644
--- a/chromeos/dbus/fake_bluetooth_device_client.cc
+++ b/chromeos/dbus/fake_bluetooth_device_client.cc
@@ -21,7 +21,7 @@
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/threading/worker_pool.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
#include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 83b65da..5998e5c 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -15,8 +15,8 @@
#include "base/observer_list.h"
#include "base/strings/stringprintf.h"
#include "base/threading/platform_thread.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
#include "chromeos/dbus/power_manager/input_event.pb.h"
#include "chromeos/dbus/power_manager/peripheral_battery_status.pb.h"
#include "chromeos/dbus/power_manager/policy.pb.h"
diff --git a/chromeos/dbus/power_manager_client.h b/chromeos/dbus/power_manager_client.h
index c3fb5b9..29a6936 100644
--- a/chromeos/dbus/power_manager_client.h
+++ b/chromeos/dbus/power_manager_client.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/dbus/dbus_client_implementation_type.h"
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc
index 19b28f5..875513f 100644
--- a/chromeos/display/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -11,7 +11,7 @@
#include "base/chromeos/chromeos_version.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/display/output_util.h"
#include "chromeos/display/real_output_configurator_delegate.h"
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index da43da7..ac86945 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -11,10 +11,10 @@
#include "base/basictypes.h"
#include "base/event_types.h"
-#include "base/observer_list.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/timer.h"
+#include "base/observer_list.h"
+#include "base/timer/timer.h"
#include "chromeos/chromeos_export.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chromeos/memory/low_memory_listener.cc b/chromeos/memory/low_memory_listener.cc
index 23d1dae..f600e55 100644
--- a/chromeos/memory/low_memory_listener.cc
+++ b/chromeos/memory/low_memory_listener.cc
@@ -10,8 +10,8 @@
#include "base/chromeos/chromeos_version.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
#include "chromeos/memory/low_memory_listener_delegate.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/zygote_host_linux.h"
diff --git a/chromeos/network/geolocation_handler.h b/chromeos/network/geolocation_handler.h
index 68766d3..5c35e18 100644
--- a/chromeos/network/geolocation_handler.h
+++ b/chromeos/network/geolocation_handler.h
@@ -6,7 +6,7 @@
#define CHROMEOS_NETWORK_GEOLOCATION_HANDLER_H_
#include "base/memory/weak_ptr.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/dbus/dbus_method_call_status.h"
#include "chromeos/dbus/shill_property_changed_observer.h"
#include "chromeos/network/network_handler.h"
diff --git a/chromeos/network/network_event_log.h b/chromeos/network/network_event_log.h
index db40b80..913f806 100644
--- a/chromeos/network/network_event_log.h
+++ b/chromeos/network/network_event_log.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/chromeos_export.h"
namespace base {
diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h
index ce04f98..442face 100644
--- a/chromeos/network/network_util.h
+++ b/chromeos/network/network_util.h
@@ -15,7 +15,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chromeos/chromeos_export.h"
namespace chromeos {