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

Unified Diff: chrome/common/extensions/api/i18n/default_locale_handler.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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 | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/extensions/api/icons/icons_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/i18n/default_locale_handler.cc
diff --git a/chrome/common/extensions/api/i18n/default_locale_handler.cc b/chrome/common/extensions/api/i18n/default_locale_handler.cc
index 9a1c26addf3a21eb1a3c7d66edd9c56d2d3776f7..a8cd544b7623e6d7971c1cb68b93d9665da7109a 100644
--- a/chrome/common/extensions/api/i18n/default_locale_handler.cc
+++ b/chrome/common/extensions/api/i18n/default_locale_handler.cc
@@ -13,6 +13,7 @@
#include "chrome/common/extensions/extension_l10n_util.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/manifest.h"
+#include "extensions/common/constants.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -51,8 +52,7 @@ bool DefaultLocaleHandler::Validate(
std::string* error,
std::vector<InstallWarning>* warnings) const {
// default_locale and _locales have to be both present or both missing.
- const base::FilePath path = extension->path().Append(
- Extension::kLocaleFolder);
+ const base::FilePath path = extension->path().Append(kLocaleFolder);
bool path_exists = file_util::PathExists(path);
std::string default_locale =
extensions::LocaleInfo::GetDefaultLocale(extension);
@@ -86,8 +86,7 @@ bool DefaultLocaleHandler::Validate(
all_locales))
continue;
- base::FilePath messages_path =
- locale_path.Append(Extension::kMessagesFilename);
+ base::FilePath messages_path = locale_path.Append(kMessagesFilename);
if (!file_util::PathExists(messages_path)) {
*error = base::StringPrintf(
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/extensions/api/icons/icons_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698