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

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

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
« no previous file with comments | « chrome/browser/extensions/installed_loader.cc ('k') | chrome/browser/extensions/pending_extension_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/pending_extension_info.h
diff --git a/chrome/browser/extensions/pending_extension_info.h b/chrome/browser/extensions/pending_extension_info.h
index 747c9160191cac8d97c508454ad2b6a0643f167e..93688e3cb9fb4a4a1f15663dd37352927ae2e9ca 100644
--- a/chrome/browser/extensions/pending_extension_info.h
+++ b/chrome/browser/extensions/pending_extension_info.h
@@ -9,6 +9,7 @@
#include "base/version.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
#include "googleurl/src/gurl.h"
FORWARD_DECLARE_TEST(ExtensionServiceTest, AddPendingExtensionFromSync);
@@ -32,7 +33,7 @@ class PendingExtensionInfo {
ShouldAllowInstallPredicate should_allow_install,
bool is_from_sync,
bool install_silently,
- Extension::Location install_source);
+ Manifest::Location install_source);
// Required for STL container membership. Should not be used directly.
PendingExtensionInfo();
@@ -55,7 +56,7 @@ class PendingExtensionInfo {
}
bool is_from_sync() const { return is_from_sync_; }
bool install_silently() const { return install_silently_; }
- Extension::Location install_source() const { return install_source_; }
+ Manifest::Location install_source() const { return install_source_; }
// Returns -1, 0 or 1 if |this| has lower, equal or higher precedence than
// |other|, respectively. "Equal" precedence means that the version and the
@@ -77,7 +78,7 @@ class PendingExtensionInfo {
bool is_from_sync_; // This update check was initiated from sync.
bool install_silently_;
- Extension::Location install_source_;
+ Manifest::Location install_source_;
FRIEND_TEST_ALL_PREFIXES(::ExtensionServiceTest, AddPendingExtensionFromSync);
};
« no previous file with comments | « chrome/browser/extensions/installed_loader.cc ('k') | chrome/browser/extensions/pending_extension_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698