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

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: rename app_list_extension_ordering to app_list_extension_sorting for consistency Created 7 years, 5 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 "base/base64.h" 9 #include "base/base64.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 return value; 261 return value;
262 } 262 }
263 263
264 base::DictionaryValue* AppSpecificsToValue( 264 base::DictionaryValue* AppSpecificsToValue(
265 const sync_pb::AppSpecifics& proto) { 265 const sync_pb::AppSpecifics& proto) {
266 base::DictionaryValue* value = new base::DictionaryValue(); 266 base::DictionaryValue* value = new base::DictionaryValue();
267 SET(extension, ExtensionSpecificsToValue); 267 SET(extension, ExtensionSpecificsToValue);
268 SET(notification_settings, AppSettingsToValue); 268 SET(notification_settings, AppSettingsToValue);
269 SET_STR(app_launch_ordinal); 269 SET_STR(app_launch_ordinal);
270 SET_STR(page_ordinal); 270 SET_STR(page_ordinal);
271 SET_STR(app_list_ordinal);
271 272
272 return value; 273 return value;
273 } 274 }
274 275
275 base::DictionaryValue* AutofillSpecificsToValue( 276 base::DictionaryValue* AutofillSpecificsToValue(
276 const sync_pb::AutofillSpecifics& proto) { 277 const sync_pb::AutofillSpecifics& proto) {
277 base::DictionaryValue* value = new base::DictionaryValue(); 278 base::DictionaryValue* value = new base::DictionaryValue();
278 SET_STR(name); 279 SET_STR(name);
279 SET_STR(value); 280 SET_STR(value);
280 SET_INT64_REP(usage_timestamp); 281 SET_INT64_REP(usage_timestamp);
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 #undef SET_BYTES 858 #undef SET_BYTES
858 #undef SET_INT32 859 #undef SET_INT32
859 #undef SET_INT64 860 #undef SET_INT64
860 #undef SET_INT64_REP 861 #undef SET_INT64_REP
861 #undef SET_STR 862 #undef SET_STR
862 #undef SET_STR_REP 863 #undef SET_STR_REP
863 864
864 #undef SET_FIELD 865 #undef SET_FIELD
865 866
866 } // namespace syncer 867 } // namespace syncer
OLDNEW
« chrome/browser/ui/app_list/extension_app_item.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