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

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

Issue 17038002: Separate the NTP app ordering from the app list app ordering (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rework + fix tests Created 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "sync/protocol/proto_value_conversions.h" 7 #include "sync/protocol/proto_value_conversions.h"
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 return value; 291 return value;
292 } 292 }
293 293
294 base::DictionaryValue* AppSpecificsToValue( 294 base::DictionaryValue* AppSpecificsToValue(
295 const sync_pb::AppSpecifics& proto) { 295 const sync_pb::AppSpecifics& proto) {
296 base::DictionaryValue* value = new base::DictionaryValue(); 296 base::DictionaryValue* value = new base::DictionaryValue();
297 SET(extension, ExtensionSpecificsToValue); 297 SET(extension, ExtensionSpecificsToValue);
298 SET(notification_settings, AppSettingsToValue); 298 SET(notification_settings, AppSettingsToValue);
299 SET_STR(app_launch_ordinal); 299 SET_STR(app_launch_ordinal);
300 SET_STR(page_ordinal); 300 SET_STR(page_ordinal);
301 SET_STR(app_list_ordinal);
301 302
302 return value; 303 return value;
303 } 304 }
304 305
305 base::DictionaryValue* AutofillSpecificsToValue( 306 base::DictionaryValue* AutofillSpecificsToValue(
306 const sync_pb::AutofillSpecifics& proto) { 307 const sync_pb::AutofillSpecifics& proto) {
307 base::DictionaryValue* value = new base::DictionaryValue(); 308 base::DictionaryValue* value = new base::DictionaryValue();
308 SET_STR(name); 309 SET_STR(name);
309 SET_STR(value); 310 SET_STR(value);
310 SET_INT64_REP(usage_timestamp); 311 SET_INT64_REP(usage_timestamp);
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 #undef SET_BYTES 899 #undef SET_BYTES
899 #undef SET_INT32 900 #undef SET_INT32
900 #undef SET_INT64 901 #undef SET_INT64
901 #undef SET_INT64_REP 902 #undef SET_INT64_REP
902 #undef SET_STR 903 #undef SET_STR
903 #undef SET_STR_REP 904 #undef SET_STR_REP
904 905
905 #undef SET_FIELD 906 #undef SET_FIELD
906 907
907 } // namespace syncer 908 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698