Index: chrome/browser/extensions/pending_extension_info.cc |
diff --git a/chrome/browser/extensions/pending_extension_info.cc b/chrome/browser/extensions/pending_extension_info.cc |
index bdf4fad38263fd27f6e7ca1b5d599c6f6798ba0b..6fc0adc9d247a9549417985f2c4ddcc3c42b039a 100644 |
--- a/chrome/browser/extensions/pending_extension_info.cc |
+++ b/chrome/browser/extensions/pending_extension_info.cc |
@@ -15,7 +15,7 @@ PendingExtensionInfo::PendingExtensionInfo( |
ShouldAllowInstallPredicate should_allow_install, |
bool is_from_sync, |
bool install_silently, |
- Extension::Location install_source) |
+ Manifest::Location install_source) |
: id_(id), |
update_url_(update_url), |
version_(version), |
@@ -30,7 +30,7 @@ PendingExtensionInfo::PendingExtensionInfo() |
should_allow_install_(NULL), |
is_from_sync_(true), |
install_silently_(false), |
- install_source_(Extension::INVALID) {} |
+ install_source_(Manifest::INVALID_LOCATION) {} |
bool PendingExtensionInfo::operator==(const PendingExtensionInfo& rhs) const { |
return id_ == rhs.id_; |
@@ -55,8 +55,8 @@ int PendingExtensionInfo::CompareTo(const PendingExtensionInfo& other) const { |
// Different install sources; |this| has higher precedence if |
// |install_source_| is the higher priority source. |
- Extension::Location higher_priority_source = |
- Extension::GetHigherPriorityLocation( |
+ Manifest::Location higher_priority_source = |
+ Manifest::GetHigherPriorityLocation( |
install_source_, other.install_source_); |
return higher_priority_source == install_source_ ? 1 : -1; |