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

Unified Diff: chrome/common/extensions/extension_file_util.cc

Issue 19547009: Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
Index: chrome/common/extensions/extension_file_util.cc
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 16b1e54f9fb742e80a0fd9718415f6ad3ca83d7b..2ee96433f7dbce37b57d8a5882d54ef001bedb7b 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -18,7 +18,6 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
-#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/api/extension_action/action_info.h"
#include "chrome/common/extensions/extension.h"
@@ -169,7 +168,7 @@ scoped_refptr<Extension> LoadExtension(const base::FilePath& extension_path,
base::DictionaryValue* LoadManifest(const base::FilePath& extension_path,
std::string* error) {
base::FilePath manifest_path =
- extension_path.Append(extensions::kManifestFilename);
+ extension_path.Append(extensions::filenames::kManifestFilename);
if (!base::PathExists(manifest_path)) {
*error = l10n_util::GetStringUTF8(IDS_EXTENSION_MANIFEST_UNREADABLE);
return NULL;
@@ -208,7 +207,8 @@ std::vector<base::FilePath> FindPrivateKeyFiles(
base::FileEnumerator::FILES);
for (base::FilePath current = traversal.Next(); !current.empty();
current = traversal.Next()) {
- if (!current.MatchesExtension(chrome::kExtensionKeyFileExtension))
+ if (!current.MatchesExtension(
+ extensions::filenames::kExtensionKeyFileExtension))
continue;
std::string key_contents;
@@ -408,7 +408,8 @@ extensions::MessageBundle* LoadMessageBundle(
std::string* error) {
error->clear();
// Load locale information if available.
- base::FilePath locale_path = extension_path.Append(extensions::kLocaleFolder);
+ base::FilePath locale_path =
+ extension_path.Append(extensions::filenames::kLocaleFolder);
if (!base::PathExists(locale_path))
return NULL;
@@ -461,8 +462,8 @@ bool CheckForIllegalFilenames(const base::FilePath& extension_path,
std::string* error) {
// Reserved underscore names.
static const base::FilePath::CharType* reserved_names[] = {
- extensions::kLocaleFolder,
- extensions::kPlatformSpecificFolder,
+ extensions::filenames::kLocaleFolder,
+ extensions::filenames::kPlatformSpecificFolder,
FILE_PATH_LITERAL("__MACOSX"),
};
CR_DEFINE_STATIC_LOCAL(

Powered by Google App Engine
This is Rietveld 408576698