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

Unified Diff: chrome/browser/extensions/pending_extension_info.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/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;
« no previous file with comments | « chrome/browser/extensions/pending_extension_info.h ('k') | chrome/browser/extensions/pending_extension_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698