diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 03:15:59 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 03:15:59 +0000 |
| commit | 2041cf34db4b3b9e43f9c63a57975798c0677ad7 (patch) | |
| tree | 5caa67abfd19b51f124c17ac0c6a68eca0d9e860 /net/base | |
| parent | cf03da1cccdc0bae0ced1dcf599c8a74324a1577 (diff) | |
| download | chromium_src-2041cf34db4b3b9e43f9c63a57975798c0677ad7.zip chromium_src-2041cf34db4b3b9e43f9c63a57975798c0677ad7.tar.gz chromium_src-2041cf34db4b3b9e43f9c63a57975798c0677ad7.tar.bz2 | |
Pulled out Callback code into base/callback.h. This is the first step towards redoing the Callback interfaces.
Added and removed includes as needed.
BUG=35223
TEST=trybots
Review URL: http://codereview.chromium.org/646061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/completion_callback.h | 2 | ||||
| -rw-r--r-- | net/base/cookie_policy.h | 2 | ||||
| -rw-r--r-- | net/base/file_stream_posix.cc | 7 | ||||
| -rw-r--r-- | net/base/file_stream_unittest.cc | 7 | ||||
| -rw-r--r-- | net/base/static_cookie_policy.h | 2 | ||||
| -rw-r--r-- | net/base/test_completion_callback.h | 1 |
6 files changed, 14 insertions, 7 deletions
diff --git a/net/base/completion_callback.h b/net/base/completion_callback.h index 7a5655b..11a6b3a 100644 --- a/net/base/completion_callback.h +++ b/net/base/completion_callback.h @@ -5,7 +5,7 @@ #ifndef NET_BASE_COMPLETION_CALLBACK_H__ #define NET_BASE_COMPLETION_CALLBACK_H__ -#include "base/task.h" +#include "base/callback.h" namespace net { diff --git a/net/base/cookie_policy.h b/net/base/cookie_policy.h index f502e64d..5e57c90 100644 --- a/net/base/cookie_policy.h +++ b/net/base/cookie_policy.h @@ -5,6 +5,8 @@ #ifndef NET_BASE_COOKIE_POLICY_H_ #define NET_BASE_COOKIE_POLICY_H_ +#include <string> + #include "net/base/completion_callback.h" class GURL; diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index eda0927..a4c5b3c 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. // For 64-bit file access (off_t = off64_t, lseek64, etc). #define _FILE_OFFSET_BITS 64 @@ -14,6 +14,7 @@ #include <errno.h> #include "base/basictypes.h" +#include "base/callback.h" #include "base/eintr_wrapper.h" #include "base/file_path.h" #include "base/logging.h" diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index a7a650f..cf80699 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc @@ -1,7 +1,8 @@ -// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#include "base/callback.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/platform_file.h" diff --git a/net/base/static_cookie_policy.h b/net/base/static_cookie_policy.h index 4734d33..d903149 100644 --- a/net/base/static_cookie_policy.h +++ b/net/base/static_cookie_policy.h @@ -5,6 +5,8 @@ #ifndef NET_BASE_STATIC_COOKIE_POLICY_H_ #define NET_BASE_STATIC_COOKIE_POLICY_H_ +#include <string> + #include "base/basictypes.h" #include "net/base/cookie_policy.h" diff --git a/net/base/test_completion_callback.h b/net/base/test_completion_callback.h index 5fa14ae..1d24532 100644 --- a/net/base/test_completion_callback.h +++ b/net/base/test_completion_callback.h @@ -5,6 +5,7 @@ #ifndef NET_BASE_TEST_COMPLETION_CALLBACK_H_ #define NET_BASE_TEST_COMPLETION_CALLBACK_H_ +#include "base/callback.h" #include "base/message_loop.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" |