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

Unified Diff: components/sync_driver/sync_prefs.cc

Issue 1549993003: Switch to standard integer types in components/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « components/sync_driver/sync_prefs.h ('k') | components/sync_driver/sync_prefs_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/sync_prefs.cc
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index a000fc426d929a554257087aa5a41944b7eee428..6f005ec8bb9058fc435945041d11e7d30867a042 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -490,7 +490,7 @@ void SyncPrefs::SetCleanShutdown(bool value) {
}
void SyncPrefs::GetInvalidationVersions(
- std::map<syncer::ModelType, int64>* invalidation_versions) const {
+ std::map<syncer::ModelType, int64_t>* invalidation_versions) const {
const base::DictionaryValue* invalidation_dictionary =
pref_service_->GetDictionary(prefs::kSyncInvalidationVersions);
syncer::ModelTypeSet protocol_types = syncer::ProtocolTypes();
@@ -499,7 +499,7 @@ void SyncPrefs::GetInvalidationVersions(
std::string version_str;
if (!invalidation_dictionary->GetString(key, &version_str))
continue;
- int64 version = 0;
+ int64_t version = 0;
if (!base::StringToInt64(version_str, &version))
continue;
(*invalidation_versions)[iter.Get()] = version;
@@ -507,7 +507,7 @@ void SyncPrefs::GetInvalidationVersions(
}
void SyncPrefs::UpdateInvalidationVersions(
- const std::map<syncer::ModelType, int64>& invalidation_versions) {
+ const std::map<syncer::ModelType, int64_t>& invalidation_versions) {
scoped_ptr<base::DictionaryValue> invalidation_dictionary(
new base::DictionaryValue());
for (const auto& map_iter : invalidation_versions) {
« no previous file with comments | « components/sync_driver/sync_prefs.h ('k') | components/sync_driver/sync_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698