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

Unified Diff: chrome/browser/extensions/extension_i18n_api.cc

Issue 10701026: Use JSON schema compiler for i18n api (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/extensions/api/api.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_i18n_api.cc
diff --git a/chrome/browser/extensions/extension_i18n_api.cc b/chrome/browser/extensions/extension_i18n_api.cc
index def43805fa642327adb5cd920da838afd175c166..5df6efbbe7cad79b85bd134fb45d41b4740d4fb8 100644
--- a/chrome/browser/extensions/extension_i18n_api.cc
+++ b/chrome/browser/extensions/extension_i18n_api.cc
@@ -4,11 +4,17 @@
#include "chrome/browser/extensions/extension_i18n_api.h"
+#include <string>
+#include <vector>
+
#include "base/string_piece.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/extensions/api/i18n.h"
+
+namespace GetAcceptLanguages = extensions::api::i18n::GetAcceptLanguages;
// Errors.
static const char kEmptyAcceptLanguagesError[] = "accept-languages is empty.";
@@ -26,20 +32,19 @@ bool GetAcceptLanguagesFunction::RunImpl() {
// of the language code) on accept-languages set through editing preference
// file directly. So, here, we're adding extra checks to be resistant to
// crashes caused by data corruption.
- result_.reset(new ListValue());
if (acceptLanguages.empty()) {
error_ = kEmptyAcceptLanguagesError;
return false;
}
size_t begin = 0;
size_t end;
+ std::vector<std::string> languages_vec;
not at google - send to devlin 2012/06/29 04:58:00 just "languages"?
mitchellwrosen 2012/07/27 23:51:41 Done.
while (1) {
end = acceptLanguages.find(',', begin);
if (end > begin) {
// Guard against a malformed value with multiple "," in a row.
- string16 acceptLang = acceptLanguages.substr(begin, end - begin);
- static_cast<ListValue*>(result_.get())->
- Append(Value::CreateStringValue(acceptLang));
+ languages_vec.push_back(
+ UTF16ToUTF8(acceptLanguages.substr(begin, end - begin)));
}
begin = end + 1;
// 'begin >= acceptLanguages.length()' to guard against a value
@@ -47,9 +52,12 @@ bool GetAcceptLanguagesFunction::RunImpl() {
if (end == string16::npos || begin >= acceptLanguages.length())
break;
}
not at google - send to devlin 2012/06/29 04:58:00 This code should be using base::SplitString (base/
- if (static_cast<ListValue*>(result_.get())->GetSize() == 0) {
+
+ if (languages_vec.empty()) {
error_ = kEmptyAcceptLanguagesError;
return false;
}
+
+ result_.reset(GetAcceptLanguages::Result::Create(languages_vec));
return true;
}
« no previous file with comments | « no previous file | chrome/common/extensions/api/api.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698