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

Side by Side Diff: extensions/browser/warning_set.cc

Issue 859993002: Using "static_assert" in lieu of "COMPILE_ASSERT" in extensions module (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 "extensions/browser/warning_set.h" 5 #include "extensions/browser/warning_set.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 std::string message = message_parameters_[i]; 197 std::string message = message_parameters_[i];
198 if (StartsWithASCII(message, kTranslate, true)) { 198 if (StartsWithASCII(message, kTranslate, true)) {
199 std::string extension_id = message.substr(sizeof(kTranslate) - 1); 199 std::string extension_id = message.substr(sizeof(kTranslate) - 1);
200 const extensions::Extension* extension = 200 const extensions::Extension* extension =
201 extensions->GetByID(extension_id); 201 extensions->GetByID(extension_id);
202 message = extension ? extension->name() : extension_id; 202 message = extension ? extension->name() : extension_id;
203 } 203 }
204 final_parameters.push_back(base::UTF8ToUTF16(net::EscapeForHTML(message))); 204 final_parameters.push_back(base::UTF8ToUTF16(net::EscapeForHTML(message)));
205 } 205 }
206 206
207 COMPILE_ASSERT(kMaxNumberOfParameters == 4u, YouNeedToAddMoreCaseStatements); 207 static_assert(kMaxNumberOfParameters == 4u,
208 "You Need To Add More Case Statements");
208 switch (final_parameters.size()) { 209 switch (final_parameters.size()) {
209 case 0: 210 case 0:
210 return l10n_util::GetStringUTF8(message_id_); 211 return l10n_util::GetStringUTF8(message_id_);
211 case 1: 212 case 1:
212 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0]); 213 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0]);
213 case 2: 214 case 2:
214 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0], 215 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
215 final_parameters[1]); 216 final_parameters[1]);
216 case 3: 217 case 3:
217 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0], 218 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
218 final_parameters[1], final_parameters[2]); 219 final_parameters[1], final_parameters[2]);
219 case 4: 220 case 4:
220 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0], 221 return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
221 final_parameters[1], final_parameters[2], final_parameters[3]); 222 final_parameters[1], final_parameters[2], final_parameters[3]);
222 default: 223 default:
223 NOTREACHED(); 224 NOTREACHED();
224 return std::string(); 225 return std::string();
225 } 226 }
226 } 227 }
227 228
228 bool operator<(const Warning& a, const Warning& b) { 229 bool operator<(const Warning& a, const Warning& b) {
229 if (a.extension_id() != b.extension_id()) 230 if (a.extension_id() != b.extension_id())
230 return a.extension_id() < b.extension_id(); 231 return a.extension_id() < b.extension_id();
231 return a.warning_type() < b.warning_type(); 232 return a.warning_type() < b.warning_type();
232 } 233 }
233 234
234 } // namespace extensions 235 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/declarative_webrequest/request_stage.cc ('k') | extensions/common/constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698