OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ | 5 #ifndef SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ |
6 #define CHROME_BROWSER_SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ | 6 #define SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <iosfwd> | 9 #include <iosfwd> |
10 #include <string> | 10 #include <string> |
11 | 11 |
12 #include "base/atomicops.h" | 12 #include "base/atomicops.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "base/synchronization/lock.h" |
16 #include "base/threading/non_thread_safe.h" | 17 #include "base/threading/non_thread_safe.h" |
17 #include "base/threading/thread_checker.h" | 18 #include "base/threading/thread_checker.h" |
18 #include "base/synchronization/lock.h" | 19 #include "sync/syncable/syncable_id.h" |
19 #include "chrome/browser/sync/syncable/syncable_id.h" | |
20 | 20 |
21 namespace syncable { | 21 namespace syncable { |
22 class Directory; | 22 class Directory; |
23 } | 23 } |
24 | 24 |
25 namespace sync_pb { | 25 namespace sync_pb { |
26 class ClientToServerMessage; | 26 class ClientToServerMessage; |
27 } | 27 } |
28 | 28 |
29 namespace browser_sync { | 29 namespace browser_sync { |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 // Fills a ClientToServerMessage with the appropriate share and birthday | 383 // Fills a ClientToServerMessage with the appropriate share and birthday |
384 // settings. | 384 // settings. |
385 bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm, | 385 bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm, |
386 syncable::Directory* manager, | 386 syncable::Directory* manager, |
387 const std::string& share); | 387 const std::string& share); |
388 | 388 |
389 std::ostream& operator<<(std::ostream& s, const struct HttpResponse& hr); | 389 std::ostream& operator<<(std::ostream& s, const struct HttpResponse& hr); |
390 | 390 |
391 } // namespace browser_sync | 391 } // namespace browser_sync |
392 | 392 |
393 #endif // CHROME_BROWSER_SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ | 393 #endif // SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_ |
OLD | NEW |