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

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

Issue 353493002: Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « sync/protocol/extension_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 <string> 9 #include <string>
10 10
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 554
555 base::DictionaryValue* ExtensionSpecificsToValue( 555 base::DictionaryValue* ExtensionSpecificsToValue(
556 const sync_pb::ExtensionSpecifics& proto) { 556 const sync_pb::ExtensionSpecifics& proto) {
557 base::DictionaryValue* value = new base::DictionaryValue(); 557 base::DictionaryValue* value = new base::DictionaryValue();
558 SET_STR(id); 558 SET_STR(id);
559 SET_STR(version); 559 SET_STR(version);
560 SET_STR(update_url); 560 SET_STR(update_url);
561 SET_BOOL(enabled); 561 SET_BOOL(enabled);
562 SET_BOOL(incognito_enabled); 562 SET_BOOL(incognito_enabled);
563 SET_BOOL(remote_install); 563 SET_BOOL(remote_install);
564 SET_BOOL(installed_by_custodian);
564 SET_STR(name); 565 SET_STR(name);
565 return value; 566 return value;
566 } 567 }
567 568
568 namespace { 569 namespace {
569 base::DictionaryValue* FaviconDataToValue( 570 base::DictionaryValue* FaviconDataToValue(
570 const sync_pb::FaviconData& proto) { 571 const sync_pb::FaviconData& proto) {
571 base::DictionaryValue* value = new base::DictionaryValue(); 572 base::DictionaryValue* value = new base::DictionaryValue();
572 SET_BYTES(favicon); 573 SET_BYTES(favicon);
573 SET_INT32(width); 574 SET_INT32(width);
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 #undef SET_BYTES 1120 #undef SET_BYTES
1120 #undef SET_INT32 1121 #undef SET_INT32
1121 #undef SET_INT64 1122 #undef SET_INT64
1122 #undef SET_INT64_REP 1123 #undef SET_INT64_REP
1123 #undef SET_STR 1124 #undef SET_STR
1124 #undef SET_STR_REP 1125 #undef SET_STR_REP
1125 1126
1126 #undef SET_FIELD 1127 #undef SET_FIELD
1127 1128
1128 } // namespace syncer 1129 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/protocol/extension_specifics.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698