diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 15:20:02 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-28 15:20:02 +0000 |
| commit | b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3 (patch) | |
| tree | 5fd9ff94cd23e65508c736a2c0d9736dd43da04b /jingle | |
| parent | a43858f7591e67408d501f885ec1317b5e9ceed5 (diff) | |
| download | chromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.zip chromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.tar.gz chromium_src-b43e556b26d1c54b47e9deb54fcfc2a4ee6216a3.tar.bz2 | |
Use a direct include of time headers in courgette/, crypto/, dbus/, device/, google_apis/, gpu/, ipc/, jingle/.
BUG=254986
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/18156002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/pseudotcp_adapter.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/pseudotcp_adapter.h | 2 | ||||
| -rw-r--r-- | jingle/notifier/communicator/login.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/communicator/login.h | 4 | ||||
| -rw-r--r-- | jingle/notifier/communicator/login_settings.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc index 484ed2e..87c1fb8 100644 --- a/jingle/glue/pseudotcp_adapter.cc +++ b/jingle/glue/pseudotcp_adapter.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h index b8e3957..63764c4 100644 --- a/jingle/glue/pseudotcp_adapter.h +++ b/jingle/glue/pseudotcp_adapter.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/timer.h" #include "base/threading/non_thread_safe.h" +#include "base/timer/timer.h" #include "net/base/net_log.h" #include "net/socket/stream_socket.h" #include "third_party/libjingle/source/talk/p2p/base/pseudotcp.h" diff --git a/jingle/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc index 8350d2f..6c50862 100644 --- a/jingle/notifier/communicator/login.cc +++ b/jingle/notifier/communicator/login.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/rand_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/host_port_pair.h" #include "talk/base/common.h" #include "talk/base/firewallsocketserver.h" diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h index 1fffb92..463eb1a 100644 --- a/jingle/notifier/communicator/login.h +++ b/jingle/notifier/communicator/login.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.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 "jingle/notifier/base/server_information.h" #include "jingle/notifier/communicator/login_settings.h" #include "jingle/notifier/communicator/single_login_attempt.h" diff --git a/jingle/notifier/communicator/login_settings.h b/jingle/notifier/communicator/login_settings.h index 7ccc109..04ab92d 100644 --- a/jingle/notifier/communicator/login_settings.h +++ b/jingle/notifier/communicator/login_settings.h @@ -7,7 +7,7 @@ #include <string> #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "jingle/notifier/base/server_information.h" #include "net/url_request/url_request_context_getter.h" #include "talk/xmpp/xmppclientsettings.h" |