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

Unified Diff: chrome/browser/sync/internal_api/sync_manager.cc

Issue 7719011: Move some files from sync/engine to internal_api (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Refresh the diff and remove unintended change Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/internal_api/sync_manager.cc
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc
index 7f10f4ddaae9f1326c8c38ccb0651cc4f2bcfdc5..b2924b353cb24fd8006d09d5d0601ea4aa771da7 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/chrome/browser/sync/internal_api/sync_manager.cc
@@ -12,16 +12,17 @@
#include "base/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/sync/engine/all_status.h"
-#include "chrome/browser/sync/engine/change_reorder_buffer.h"
#include "chrome/browser/sync/engine/net/server_connection_manager.h"
-#include "chrome/browser/sync/engine/net/syncapi_server_connection_manager.h"
#include "chrome/browser/sync/engine/nigori_util.h"
#include "chrome/browser/sync/engine/syncapi_internal.h"
#include "chrome/browser/sync/engine/syncer_types.h"
#include "chrome/browser/sync/engine/sync_scheduler.h"
#include "chrome/browser/sync/internal_api/base_node.h"
+#include "chrome/browser/sync/internal_api/change_reorder_buffer.h"
+#include "chrome/browser/sync/internal_api/configure_reason.h"
#include "chrome/browser/sync/internal_api/read_node.h"
#include "chrome/browser/sync/internal_api/read_transaction.h"
+#include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h"
#include "chrome/browser/sync/internal_api/user_share.h"
#include "chrome/browser/sync/internal_api/write_node.h"
#include "chrome/browser/sync/internal_api/write_transaction.h"
@@ -35,6 +36,7 @@
#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "chrome/browser/sync/protocol/proto_value_conversions.h"
+#include "chrome/browser/sync/protocol/sync.pb.h"
#include "chrome/browser/sync/syncable/directory_change_delegate.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/syncable/model_type.h"
@@ -75,6 +77,7 @@ using syncable::EntryKernelMutationSet;
using syncable::ModelType;
using syncable::ModelTypeBitSet;
using syncable::SPECIFICS;
+using sync_pb::GetUpdatesCallerInfo;
typedef GoogleServiceAuthError AuthError;
@@ -86,6 +89,24 @@ static const int kSyncSchedulerDelayMsec = 250;
static const int kChromeOSNetworkChangeReactionDelayHackMsec = 5000;
#endif // OS_CHROMEOS
+GetUpdatesCallerInfo::GetUpdatesSource GetSourceFromReason(
+ sync_api::ConfigureReason reason) {
+ switch (reason) {
+ case sync_api::CONFIGURE_REASON_RECONFIGURATION:
+ return GetUpdatesCallerInfo::RECONFIGURATION;
+ case sync_api::CONFIGURE_REASON_MIGRATION:
+ return GetUpdatesCallerInfo::MIGRATION;
+ case sync_api::CONFIGURE_REASON_NEW_CLIENT:
+ return GetUpdatesCallerInfo::NEW_CLIENT;
+ case sync_api::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE:
+ return GetUpdatesCallerInfo::NEWLY_SUPPORTED_DATATYPE;
+ default:
+ NOTREACHED();
+ }
+
+ return GetUpdatesCallerInfo::UNKNOWN;
+}
+
} // namespace
namespace sync_api {
@@ -698,7 +719,7 @@ void SyncManager::RequestConfig(const syncable::ModelTypeBitSet& types,
return;
}
StartConfigurationMode(NULL);
- data_->scheduler()->ScheduleConfig(types, reason);
+ data_->scheduler()->ScheduleConfig(types, GetSourceFromReason(reason));
}
void SyncManager::StartConfigurationMode(ModeChangeCallback* callback) {
« no previous file with comments | « chrome/browser/sync/internal_api/sync_manager.h ('k') | chrome/browser/sync/internal_api/syncapi_server_connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698