Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/browser/sync/engine/syncer_thread.h" | 5 #include "chrome/browser/sync/engine/syncer_thread.h" |
| 5 | 6 |
| 6 #include "build/build_config.h" | |
|
James Hawkins
2010/12/22 21:54:36
The file is using a define from build_config.h so
Lei Zhang
2011/01/08 01:51:36
syncer_thread.h already uses #if define, so it's c
| |
| 7 | |
| 8 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) |
|
James Hawkins
2010/12/22 21:54:36
Platform-specific includes should be at the bottom
Lei Zhang
2011/01/08 01:51:36
Done.
| |
| 9 #include <CoreFoundation/CFNumber.h> | 8 #include <CoreFoundation/CFNumber.h> |
| 10 #include <IOKit/IOTypes.h> | 9 #include <IOKit/IOTypes.h> |
| 11 #include <IOKit/IOKitLib.h> | 10 #include <IOKit/IOKitLib.h> |
| 12 #endif | 11 #endif |
| 13 | 12 |
| 14 #include <algorithm> | 13 #include <algorithm> |
| 15 #include <map> | 14 #include <map> |
| 16 #include <queue> | 15 #include <queue> |
| 17 | 16 |
| 18 #include "base/rand_util.h" | 17 #include "base/rand_util.h" |
| 19 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 18 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
| 20 #include "chrome/browser/sync/engine/model_safe_worker.h" | 19 #include "chrome/browser/sync/engine/model_safe_worker.h" |
| 21 #include "chrome/browser/sync/engine/net/server_connection_manager.h" | 20 #include "chrome/browser/sync/engine/net/server_connection_manager.h" |
| 22 #include "chrome/browser/sync/engine/syncer.h" | 21 #include "chrome/browser/sync/engine/syncer.h" |
| 23 #include "chrome/browser/sync/sessions/sync_session.h" | 22 #include "chrome/browser/sync/sessions/sync_session.h" |
| 24 #include "chrome/common/chrome_switches.h" | |
| 25 #include "jingle/notifier/listener/notification_constants.h" | 23 #include "jingle/notifier/listener/notification_constants.h" |
| 26 | 24 |
| 27 using std::priority_queue; | 25 using std::priority_queue; |
| 28 using std::min; | 26 using std::min; |
| 29 using base::Time; | 27 using base::Time; |
| 30 using base::TimeDelta; | 28 using base::TimeDelta; |
| 31 using base::TimeTicks; | 29 using base::TimeTicks; |
| 32 | 30 |
| 33 namespace browser_sync { | 31 namespace browser_sync { |
| 34 | 32 |
| (...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 843 was_logged = true; | 841 was_logged = true; |
| 844 VLOG(1) << "UserIdleTime unimplemented on this platform, synchronization " | 842 VLOG(1) << "UserIdleTime unimplemented on this platform, synchronization " |
| 845 "will not throttle when user idle"; | 843 "will not throttle when user idle"; |
| 846 } | 844 } |
| 847 #endif | 845 #endif |
| 848 | 846 |
| 849 return 0; | 847 return 0; |
| 850 } | 848 } |
| 851 | 849 |
| 852 } // namespace browser_sync | 850 } // namespace browser_sync |
| OLD | NEW |