Commit 400d6397 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Resolve conflict for namespace "errors"

In Jumbo build, the local redefinition of the namespace
errors, for example "namespace errors = manifest_errors",
causes conflicts between files. This is resolved by removing the local
redefinition and using the full name instead.

Bug: 850484
Change-Id: I5b8aecd3dc5b7c922bef515b82f11c5bfdf19515
Reviewed-on: https://chromium-review.googlesource.com/1095075Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#565999}
parent e9a371b1
......@@ -13,8 +13,6 @@
namespace extensions {
namespace errors = manifest_errors;
namespace {
SpellcheckDictionaryInfo* GetSpellcheckDictionaryInfo(
......
......@@ -47,8 +47,6 @@ using content::BrowserThread;
namespace extensions {
namespace errors = manifest_errors;
namespace {
// The following enumeration is used in histograms matching
......@@ -189,7 +187,7 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
GetCreationFlags(&info),
&error);
} else {
error = errors::kManifestUnreadable;
error = manifest_errors::kManifestUnreadable;
}
// Once installed, non-unpacked extensions cannot change their IDs (e.g., by
......@@ -197,7 +195,7 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {
// TODO(jstritar): migrate preferences when unpacked extensions change IDs.
if (extension.get() && !Manifest::IsUnpackedLocation(extension->location()) &&
info.extension_id != extension->id()) {
error = errors::kCannotChangeExtensionID;
error = manifest_errors::kCannotChangeExtensionID;
extension = nullptr;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment