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

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: rebase Created 7 years, 2 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 return value; 320 return value;
321 } 321 }
322 322
323 base::DictionaryValue* AppSpecificsToValue( 323 base::DictionaryValue* AppSpecificsToValue(
324 const sync_pb::AppSpecifics& proto) { 324 const sync_pb::AppSpecifics& proto) {
325 base::DictionaryValue* value = new base::DictionaryValue(); 325 base::DictionaryValue* value = new base::DictionaryValue();
326 SET(extension, ExtensionSpecificsToValue); 326 SET(extension, ExtensionSpecificsToValue);
327 SET(notification_settings, AppSettingsToValue); 327 SET(notification_settings, AppSettingsToValue);
328 SET_STR(app_launch_ordinal); 328 SET_STR(app_launch_ordinal);
329 SET_STR(page_ordinal); 329 SET_STR(page_ordinal);
330 SET_STR(app_list_ordinal);
330 331
331 return value; 332 return value;
332 } 333 }
333 334
334 base::DictionaryValue* AutofillSpecificsToValue( 335 base::DictionaryValue* AutofillSpecificsToValue(
335 const sync_pb::AutofillSpecifics& proto) { 336 const sync_pb::AutofillSpecifics& proto) {
336 base::DictionaryValue* value = new base::DictionaryValue(); 337 base::DictionaryValue* value = new base::DictionaryValue();
337 SET_STR(name); 338 SET_STR(name);
338 SET_STR(value); 339 SET_STR(value);
339 SET_INT64_REP(usage_timestamp); 340 SET_INT64_REP(usage_timestamp);
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 #undef SET_BYTES 930 #undef SET_BYTES
930 #undef SET_INT32 931 #undef SET_INT32
931 #undef SET_INT64 932 #undef SET_INT64
932 #undef SET_INT64_REP 933 #undef SET_INT64_REP
933 #undef SET_STR 934 #undef SET_STR
934 #undef SET_STR_REP 935 #undef SET_STR_REP
935 936
936 #undef SET_FIELD 937 #undef SET_FIELD
937 938
938 } // namespace syncer 939 } // namespace syncer
OLDNEW
« chrome/browser/ui/extensions/application_launch.cc ('K') | « sync/protocol/app_specifics.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698