OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #include "chrome/browser/sync/glue/sync_backend_host.h" | 7 #include "chrome/browser/sync/glue/sync_backend_host.h" |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/sync/notifier/sync_notifier.h" | 26 #include "chrome/browser/sync/notifier/sync_notifier.h" |
27 #include "chrome/browser/sync/protocol/sync.pb.h" | 27 #include "chrome/browser/sync/protocol/sync.pb.h" |
28 #include "chrome/browser/sync/sessions/session_state.h" | 28 #include "chrome/browser/sync/sessions/session_state.h" |
29 // TODO(tim): Remove this! We should have a syncapi pass-thru instead. | 29 // TODO(tim): Remove this! We should have a syncapi pass-thru instead. |
30 #include "chrome/browser/sync/syncable/directory_manager.h" // Cryptographer. | 30 #include "chrome/browser/sync/syncable/directory_manager.h" // Cryptographer. |
31 #include "chrome/browser/sync/sync_prefs.h" | 31 #include "chrome/browser/sync/sync_prefs.h" |
32 #include "chrome/common/chrome_notification_types.h" | 32 #include "chrome/common/chrome_notification_types.h" |
33 #include "chrome/common/chrome_version_info.h" | 33 #include "chrome/common/chrome_version_info.h" |
34 #include "chrome/common/net/gaia/gaia_constants.h" | 34 #include "chrome/common/net/gaia/gaia_constants.h" |
35 #include "content/browser/browser_thread.h" | 35 #include "content/browser/browser_thread.h" |
36 #include "content/common/content_client.h" | |
37 #include "content/common/notification_service.h" | 36 #include "content/common/notification_service.h" |
| 37 #include "content/public/common/content_client.h" |
38 | 38 |
39 static const int kSaveChangesIntervalSeconds = 10; | 39 static const int kSaveChangesIntervalSeconds = 10; |
40 static const FilePath::CharType kSyncDataFolderName[] = | 40 static const FilePath::CharType kSyncDataFolderName[] = |
41 FILE_PATH_LITERAL("Sync Data"); | 41 FILE_PATH_LITERAL("Sync Data"); |
42 | 42 |
43 typedef TokenService::TokenAvailableDetails TokenAvailableDetails; | 43 typedef TokenService::TokenAvailableDetails TokenAvailableDetails; |
44 | 44 |
45 typedef GoogleServiceAuthError AuthError; | 45 typedef GoogleServiceAuthError AuthError; |
46 | 46 |
47 namespace browser_sync { | 47 namespace browser_sync { |
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 FROM_HERE, | 1044 FROM_HERE, |
1045 base::Bind(&SyncBackendHost::Core::DoRefreshEncryption, | 1045 base::Bind(&SyncBackendHost::Core::DoRefreshEncryption, |
1046 core_.get(), sync_thread_done_callback)); | 1046 core_.get(), sync_thread_done_callback)); |
1047 } | 1047 } |
1048 | 1048 |
1049 #undef SVLOG | 1049 #undef SVLOG |
1050 | 1050 |
1051 #undef SLOG | 1051 #undef SLOG |
1052 | 1052 |
1053 } // namespace browser_sync | 1053 } // namespace browser_sync |
OLD | NEW |