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

Side by Side Diff: chrome/browser/sync/protocol/proto_value_conversions.cc

Issue 7104088: Changed typed url sync to no longer modify typed/visit_count. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated per review comments. Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
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 // Keep this file in sync with the .proto files in this directory. 5 // Keep this file in sync with the .proto files in this directory.
6 6
7 #include "chrome/browser/sync/protocol/proto_value_conversions.h" 7 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 SET_STR(custom_theme_id); 279 SET_STR(custom_theme_id);
280 SET_STR(custom_theme_update_url); 280 SET_STR(custom_theme_update_url);
281 return value; 281 return value;
282 } 282 }
283 283
284 DictionaryValue* TypedUrlSpecificsToValue( 284 DictionaryValue* TypedUrlSpecificsToValue(
285 const sync_pb::TypedUrlSpecifics& proto) { 285 const sync_pb::TypedUrlSpecifics& proto) {
286 DictionaryValue* value = new DictionaryValue(); 286 DictionaryValue* value = new DictionaryValue();
287 SET_STR(url); 287 SET_STR(url);
288 SET_STR(title); 288 SET_STR(title);
289 SET_INT32(typed_count);
290 SET_BOOL(hidden); 289 SET_BOOL(hidden);
291 SET_INT64_REP(visit); 290 SET_INT64_REP(visits);
292 SET_INT32(visited_count); 291 SET_INT32_REP(visit_transitions);
293 return value; 292 return value;
294 } 293 }
295 294
296 DictionaryValue* EntitySpecificsToValue( 295 DictionaryValue* EntitySpecificsToValue(
297 const sync_pb::EntitySpecifics& specifics) { 296 const sync_pb::EntitySpecifics& specifics) {
298 DictionaryValue* value = new DictionaryValue(); 297 DictionaryValue* value = new DictionaryValue();
299 SET_EXTENSION(sync_pb, app, AppSpecificsToValue); 298 SET_EXTENSION(sync_pb, app, AppSpecificsToValue);
300 SET_EXTENSION(sync_pb, autofill, AutofillSpecificsToValue); 299 SET_EXTENSION(sync_pb, autofill, AutofillSpecificsToValue);
301 SET_EXTENSION(sync_pb, autofill_profile, AutofillProfileSpecificsToValue); 300 SET_EXTENSION(sync_pb, autofill_profile, AutofillProfileSpecificsToValue);
302 SET_EXTENSION(sync_pb, bookmark, BookmarkSpecificsToValue); 301 SET_EXTENSION(sync_pb, bookmark, BookmarkSpecificsToValue);
(...skipping 13 matching lines...) Expand all
316 #undef SET_BOOL 315 #undef SET_BOOL
317 #undef SET_BYTES 316 #undef SET_BYTES
318 #undef SET_INT32 317 #undef SET_INT32
319 #undef SET_INT64 318 #undef SET_INT64
320 #undef SET_INT64_REP 319 #undef SET_INT64_REP
321 #undef SET_STR 320 #undef SET_STR
322 321
323 #undef SET_EXTENSION 322 #undef SET_EXTENSION
324 323
325 } // namespace browser_sync 324 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/protocol/typed_url_specifics.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698