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

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

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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_manager.cc
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 2958ed19edfe462b5076f7f70283039728def01b..7d0546210b9b43dd92819b87236f6896b7ccbc98 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -25,7 +25,7 @@
return true;
}
-std::string GetVersionString(const base::Version& version) {
+std::string GetVersionString(const Version& version) {
return version.IsValid() ? version.GetString() : "invalid";
}
@@ -121,7 +121,7 @@
return AddExtensionImpl(id,
std::string(),
update_url,
- base::Version(),
+ Version(),
should_allow_install,
kIsFromSync,
kSyncLocation,
@@ -151,7 +151,7 @@
return AddExtensionImpl(id,
std::string(),
update_url,
- base::Version(),
+ Version(),
should_allow_install,
kIsFromSync,
kManifestLocation,
@@ -192,7 +192,7 @@
return AddExtensionImpl(id,
install_parameter,
update_url,
- base::Version(),
+ Version(),
&AlwaysInstall,
kIsFromSync,
location,
@@ -201,10 +201,11 @@
kRemoteInstall);
}
+
bool PendingExtensionManager::AddFromExternalFile(
const std::string& id,
Manifest::Location install_source,
- const base::Version& version,
+ const Version& version,
int creation_flags,
bool mark_acknowledged) {
// TODO(skerner): AddFromSync() checks to see if the extension is
@@ -252,7 +253,7 @@
const std::string& id,
const std::string& install_parameter,
const GURL& update_url,
- const base::Version& version,
+ const Version& version,
PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
bool is_from_sync,
Manifest::Location install_source,
« no previous file with comments | « chrome/browser/extensions/pending_extension_info.cc ('k') | chrome/browser/extensions/unpacked_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698