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

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

Issue 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chrome_mash_shelf_controller.cc update due namespace renaming Created 4 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
« no previous file with comments | « sync/protocol/app_list_specifics.proto ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 260 }
261 261
262 std::unique_ptr<base::DictionaryValue> AppListSpecificsToValue( 262 std::unique_ptr<base::DictionaryValue> AppListSpecificsToValue(
263 const sync_pb::AppListSpecifics& proto) { 263 const sync_pb::AppListSpecifics& proto) {
264 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 264 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
265 SET_STR(item_id); 265 SET_STR(item_id);
266 SET_ENUM(item_type, GetAppListItemTypeString); 266 SET_ENUM(item_type, GetAppListItemTypeString);
267 SET_STR(item_name); 267 SET_STR(item_name);
268 SET_STR(parent_id); 268 SET_STR(parent_id);
269 SET_STR(item_ordinal); 269 SET_STR(item_ordinal);
270 SET_STR(item_pin_ordinal);
270 271
271 return value; 272 return value;
272 } 273 }
273 274
274 std::unique_ptr<base::DictionaryValue> AppNotificationToValue( 275 std::unique_ptr<base::DictionaryValue> AppNotificationToValue(
275 const sync_pb::AppNotification& proto) { 276 const sync_pb::AppNotification& proto) {
276 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 277 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
277 SET_STR(guid); 278 SET_STR(guid);
278 SET_STR(app_id); 279 SET_STR(app_id);
279 SET_INT64(creation_timestamp_ms); 280 SET_INT64(creation_timestamp_ms);
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 #undef SET_BYTES 1080 #undef SET_BYTES
1080 #undef SET_INT32 1081 #undef SET_INT32
1081 #undef SET_INT64 1082 #undef SET_INT64
1082 #undef SET_INT64_REP 1083 #undef SET_INT64_REP
1083 #undef SET_STR 1084 #undef SET_STR
1084 #undef SET_STR_REP 1085 #undef SET_STR_REP
1085 1086
1086 #undef SET_FIELD 1087 #undef SET_FIELD
1087 1088
1088 } // namespace syncer 1089 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/protocol/app_list_specifics.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698