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 fc7fd04f6e776e65bc873d3ce67c8698c524ef1a..7af707446ff89151c14e362c03f9b8d968032b81 100644 |
--- a/chrome/browser/extensions/pending_extension_info.h |
+++ b/chrome/browser/extensions/pending_extension_info.h |
@@ -18,7 +18,7 @@ |
// PendingExtensionManager, and remove all other users. |
class PendingExtensionInfo { |
public: |
- typedef bool (*ShouldAllowInstallPredicate)(const Extension&); |
+ typedef bool (*ShouldAllowInstallPredicate)(const extensions::Extension&); |
PendingExtensionInfo( |
const GURL& update_url, |
@@ -26,7 +26,7 @@ class PendingExtensionInfo { |
ShouldAllowInstallPredicate should_allow_install, |
bool is_from_sync, |
bool install_silently, |
- Extension::Location install_source); |
+ extensions::Extension::Location install_source); |
// Required for STL container membership. Should not be used directly. |
PendingExtensionInfo(); |
@@ -40,12 +40,14 @@ class PendingExtensionInfo { |
// If not, the extension is discarded. This allows creators of |
// PendingExtensionInfo objects to ensure that extensions meet some criteria |
// that can only be tested once the extension is unpacked. |
- bool ShouldAllowInstall(const Extension& extension) const { |
+ bool ShouldAllowInstall(const extensions::Extension& extension) const { |
return should_allow_install_(extension); |
} |
bool is_from_sync() const { return is_from_sync_; } |
bool install_silently() const { return install_silently_; } |
- Extension::Location install_source() const { return install_source_; } |
+ extensions::Extension::Location install_source() const { |
+ return install_source_; |
+ } |
private: |
GURL update_url_; |
@@ -58,7 +60,7 @@ class PendingExtensionInfo { |
bool is_from_sync_; // This update check was initiated from sync. |
bool install_silently_; |
- Extension::Location install_source_; |
+ extensions::Extension::Location install_source_; |
FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, AddPendingExtensionFromSync); |
}; |