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

Side by Side Diff: sync/syncable/model_type.cc

Issue 809073005: replace COMPILE_ASSERT with static_assert in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nit Created 5 years, 11 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/proto_enum_conversions.cc ('k') | sync/syncable/nigori_util.cc » ('j') | 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 #include "sync/internal_api/public/base/model_type.h" 5 #include "sync/internal_api/public/base/model_type.h"
6 6
7 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "sync/protocol/app_notification_specifics.pb.h" 9 #include "sync/protocol/app_notification_specifics.pb.h"
10 #include "sync/protocol/app_setting_specifics.pb.h" 10 #include "sync/protocol/app_setting_specifics.pb.h"
(...skipping 25 matching lines...) Expand all
36 "passwords", 36 "passwords",
37 "autofill", 37 "autofill",
38 "themes", 38 "themes",
39 "typedUrls", 39 "typedUrls",
40 "extensions", 40 "extensions",
41 "apps", 41 "apps",
42 "wifiCredentials", 42 "wifiCredentials",
43 "tabs", 43 "tabs",
44 }; 44 };
45 45
46 COMPILE_ASSERT( 46 static_assert(
47 34 == MODEL_TYPE_COUNT, 47 34 == MODEL_TYPE_COUNT,
48 update_kUserSelectableDataTypeNames_to_match_UserSelectableTypes); 48 "update kUserSelectableDataTypeName to match UserSelectableTypes");
49 49
50 void AddDefaultFieldValue(ModelType datatype, 50 void AddDefaultFieldValue(ModelType datatype,
51 sync_pb::EntitySpecifics* specifics) { 51 sync_pb::EntitySpecifics* specifics) {
52 if (!ProtocolTypes().Has(datatype)) { 52 if (!ProtocolTypes().Has(datatype)) {
53 NOTREACHED() << "Only protocol types have field values."; 53 NOTREACHED() << "Only protocol types have field values.";
54 return; 54 return;
55 } 55 }
56 switch (datatype) { 56 switch (datatype) {
57 case BOOKMARKS: 57 case BOOKMARKS:
58 specifics->mutable_bookmark(); 58 specifics->mutable_bookmark();
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 1150
1151 bool IsProxyType(ModelType model_type) { 1151 bool IsProxyType(ModelType model_type) {
1152 return model_type >= FIRST_PROXY_TYPE && model_type <= LAST_PROXY_TYPE; 1152 return model_type >= FIRST_PROXY_TYPE && model_type <= LAST_PROXY_TYPE;
1153 } 1153 }
1154 1154
1155 bool IsActOnceDataType(ModelType model_type) { 1155 bool IsActOnceDataType(ModelType model_type) {
1156 return model_type == HISTORY_DELETE_DIRECTIVES; 1156 return model_type == HISTORY_DELETE_DIRECTIVES;
1157 } 1157 }
1158 1158
1159 } // namespace syncer 1159 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/protocol/proto_enum_conversions.cc ('k') | sync/syncable/nigori_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698