Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: chrome/browser/sync/engine/syncer_thread.cc

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/notifier/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "chrome/browser/sync/engine/syncer_thread.h" 4 #include "chrome/browser/sync/engine/syncer_thread.h"
5 5
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 7
8 #if defined(OS_MACOSX) 8 #if defined(OS_MACOSX)
9 #include <CoreFoundation/CFNumber.h> 9 #include <CoreFoundation/CFNumber.h>
10 #include <IOKit/IOTypes.h> 10 #include <IOKit/IOTypes.h>
11 #include <IOKit/IOKitLib.h> 11 #include <IOKit/IOKitLib.h>
12 #endif 12 #endif
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <map> 15 #include <map>
16 #include <queue> 16 #include <queue>
17 17
18 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 18 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
19 #include "chrome/browser/sync/engine/auth_watcher.h" 19 #include "chrome/browser/sync/engine/auth_watcher.h"
20 #include "chrome/browser/sync/engine/model_safe_worker.h" 20 #include "chrome/browser/sync/engine/model_safe_worker.h"
21 #include "chrome/browser/sync/engine/net/server_connection_manager.h" 21 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
22 #include "chrome/browser/sync/engine/syncer.h" 22 #include "chrome/browser/sync/engine/syncer.h"
23 #include "chrome/browser/sync/syncable/directory_manager.h" 23 #include "chrome/browser/sync/syncable/directory_manager.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/net/notifier/listener/notification_constants.h" 25 #include "jingle/notifier/listener/notification_constants.h"
26 26
27 using std::priority_queue; 27 using std::priority_queue;
28 using std::min; 28 using std::min;
29 using base::Time; 29 using base::Time;
30 using base::TimeDelta; 30 using base::TimeDelta;
31 using base::TimeTicks; 31 using base::TimeTicks;
32 32
33 33
34 namespace browser_sync { 34 namespace browser_sync {
35 35
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 was_logged = true; 750 was_logged = true;
751 LOG(INFO) << "UserIdleTime unimplemented on this platform, " 751 LOG(INFO) << "UserIdleTime unimplemented on this platform, "
752 "synchronization will not throttle when user idle"; 752 "synchronization will not throttle when user idle";
753 } 753 }
754 #endif 754 #endif
755 755
756 return 0; 756 return 0;
757 } 757 }
758 758
759 } // namespace browser_sync 759 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/syncapi.cc ('k') | chrome/browser/sync/notifier/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698