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

Side by Side Diff: chrome/common/extensions/api/i18n/default_locale_handler.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/common/extensions/api/i18n/default_locale_handler.h" 5 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_enumerator.h" 8 #include "base/files/file_enumerator.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 DefaultLocaleHandler::~DefaultLocaleHandler() { 36 DefaultLocaleHandler::~DefaultLocaleHandler() {
37 } 37 }
38 38
39 bool DefaultLocaleHandler::Parse(Extension* extension, base::string16* error) { 39 bool DefaultLocaleHandler::Parse(Extension* extension, base::string16* error) {
40 scoped_ptr<LocaleInfo> info(new LocaleInfo); 40 scoped_ptr<LocaleInfo> info(new LocaleInfo);
41 if (!extension->manifest()->GetString(keys::kDefaultLocale, 41 if (!extension->manifest()->GetString(keys::kDefaultLocale,
42 &info->default_locale) || 42 &info->default_locale) ||
43 !l10n_util::IsValidLocaleSyntax(info->default_locale)) { 43 !l10n_util::IsValidLocaleSyntax(info->default_locale)) {
44 *error = ASCIIToUTF16(manifest_errors::kInvalidDefaultLocale); 44 *error = base::ASCIIToUTF16(manifest_errors::kInvalidDefaultLocale);
45 return false; 45 return false;
46 } 46 }
47 extension->SetManifestData(keys::kDefaultLocale, info.release()); 47 extension->SetManifestData(keys::kDefaultLocale, info.release());
48 return true; 48 return true;
49 } 49 }
50 50
51 bool DefaultLocaleHandler::Validate( 51 bool DefaultLocaleHandler::Validate(
52 const Extension* extension, 52 const Extension* extension,
53 std::string* error, 53 std::string* error,
54 std::vector<InstallWarning>* warnings) const { 54 std::vector<InstallWarning>* warnings) const {
(...skipping 28 matching lines...) Expand all
83 while (!(locale_path = locales.Next()).empty()) { 83 while (!(locale_path = locales.Next()).empty()) {
84 if (extension_l10n_util::ShouldSkipValidation(path, locale_path, 84 if (extension_l10n_util::ShouldSkipValidation(path, locale_path,
85 all_locales)) 85 all_locales))
86 continue; 86 continue;
87 87
88 base::FilePath messages_path = locale_path.Append(kMessagesFilename); 88 base::FilePath messages_path = locale_path.Append(kMessagesFilename);
89 89
90 if (!base::PathExists(messages_path)) { 90 if (!base::PathExists(messages_path)) {
91 *error = base::StringPrintf( 91 *error = base::StringPrintf(
92 "%s %s", errors::kLocalesMessagesFileMissing, 92 "%s %s", errors::kLocalesMessagesFileMissing,
93 UTF16ToUTF8(messages_path.LossyDisplayName()).c_str()); 93 base::UTF16ToUTF8(messages_path.LossyDisplayName()).c_str());
94 return false; 94 return false;
95 } 95 }
96 96
97 if (locale_path == default_locale_path) 97 if (locale_path == default_locale_path)
98 has_default_locale_message_file = true; 98 has_default_locale_message_file = true;
99 } 99 }
100 100
101 // Only message file for default locale has to exist. 101 // Only message file for default locale has to exist.
102 if (!has_default_locale_message_file) { 102 if (!has_default_locale_message_file) {
103 *error = errors::kLocalesNoDefaultMessages; 103 *error = errors::kLocalesNoDefaultMessages;
104 return false; 104 return false;
105 } 105 }
106 106
107 return true; 107 return true;
108 } 108 }
109 109
110 bool DefaultLocaleHandler::AlwaysValidateForType(Manifest::Type type) const { 110 bool DefaultLocaleHandler::AlwaysValidateForType(Manifest::Type type) const {
111 // Required to validate _locales directory; see Validate. 111 // Required to validate _locales directory; see Validate.
112 return true; 112 return true;
113 } 113 }
114 114
115 const std::vector<std::string> DefaultLocaleHandler::Keys() const { 115 const std::vector<std::string> DefaultLocaleHandler::Keys() const {
116 return SingleKey(keys::kDefaultLocale); 116 return SingleKey(keys::kDefaultLocale);
117 } 117 }
118 118
119 } // namespace extensions 119 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698