diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 23:37:00 +0000 |
| commit | 140905c70becf18808f2ad9d55d6efc00cb96461 (patch) | |
| tree | c8a71d1149012d01bfd91c59740704d164d82b81 /extensions/browser/pending_extension_manager.cc | |
| parent | 8f3cf5f5413e223a40fddc111759536df1400893 (diff) | |
| download | chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.zip chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.gz chromium_src-140905c70becf18808f2ad9d55d6efc00cb96461.tar.bz2 | |
Update all users of base::Version to explicitly specify the namespace, and clean up the header.
BUG=none
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/100543005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/pending_extension_manager.cc')
| -rw-r--r-- | extensions/browser/pending_extension_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/browser/pending_extension_manager.cc b/extensions/browser/pending_extension_manager.cc index d16b92b..ae74e41 100644 --- a/extensions/browser/pending_extension_manager.cc +++ b/extensions/browser/pending_extension_manager.cc @@ -22,7 +22,7 @@ bool AlwaysInstall(const extensions::Extension* extension) { return true; } -std::string GetVersionString(const Version& version) { +std::string GetVersionString(const base::Version& version) { return version.IsValid() ? version.GetString() : "invalid"; } @@ -109,7 +109,7 @@ bool PendingExtensionManager::AddFromSync( const Manifest::Location kSyncLocation = Manifest::INTERNAL; const bool kMarkAcknowledged = false; - return AddExtensionImpl(id, update_url, Version(), should_allow_install, + return AddExtensionImpl(id, update_url, base::Version(), should_allow_install, kIsFromSync, install_silently, kSyncLocation, Extension::NO_FLAGS, kMarkAcknowledged); } @@ -131,7 +131,7 @@ bool PendingExtensionManager::AddFromExtensionImport( const Manifest::Location kManifestLocation = Manifest::INTERNAL; const bool kMarkAcknowledged = false; - return AddExtensionImpl(id, update_url, Version(), should_allow_install, + return AddExtensionImpl(id, update_url, base::Version(), should_allow_install, kIsFromSync, kInstallSilently, kManifestLocation, Extension::NO_FLAGS, kMarkAcknowledged); } @@ -164,7 +164,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl( } } - return AddExtensionImpl(id, update_url, Version(), &AlwaysInstall, + return AddExtensionImpl(id, update_url, base::Version(), &AlwaysInstall, kIsFromSync, kInstallSilently, location, creation_flags, mark_acknowledged); } @@ -173,7 +173,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl( bool PendingExtensionManager::AddFromExternalFile( const std::string& id, Manifest::Location install_source, - const Version& version, + const base::Version& version, int creation_flags, bool mark_acknowledged) { // TODO(skerner): AddFromSync() checks to see if the extension is @@ -218,7 +218,7 @@ void PendingExtensionManager::GetPendingIdsForUpdateCheck( bool PendingExtensionManager::AddExtensionImpl( const std::string& id, const GURL& update_url, - const Version& version, + const base::Version& version, PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install, bool is_from_sync, bool install_silently, |