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

Unified Diff: chrome/browser/plugins/plugin_metadata.cc

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes 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
« no previous file with comments | « chrome/browser/plugins/plugin_metadata.h ('k') | chrome/browser/plugins/plugin_metadata_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_metadata.cc
diff --git a/chrome/browser/plugins/plugin_metadata.cc b/chrome/browser/plugins/plugin_metadata.cc
index 87b4418a9a0132321e1ae87acbd5a34365bc829a..b28c284f091306b7b5b78424043201f6e40599d3 100644
--- a/chrome/browser/plugins/plugin_metadata.cc
+++ b/chrome/browser/plugins/plugin_metadata.cc
@@ -42,7 +42,7 @@ PluginMetadata::PluginMetadata(const std::string& identifier,
PluginMetadata::~PluginMetadata() {
}
-void PluginMetadata::AddVersion(const Version& version,
+void PluginMetadata::AddVersion(const base::Version& version,
SecurityStatus status) {
DCHECK(versions_.find(version) == versions_.end());
versions_[version] = status;
@@ -100,14 +100,14 @@ PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
return SECURITY_STATUS_REQUIRES_AUTHORIZATION;
}
- Version version;
+ base::Version version;
content::WebPluginInfo::CreateVersionFromString(plugin.version, &version);
if (!version.IsValid())
- version = Version("0");
+ version = base::Version("0");
// |lower_bound| returns the latest version that is not newer than |version|.
- std::map<Version, SecurityStatus, VersionComparator>::const_iterator it =
- versions_.lower_bound(version);
+ std::map<base::Version, SecurityStatus, VersionComparator>::const_iterator
+ it = versions_.lower_bound(version);
// If there is at least one version defined, everything older than the oldest
// defined version is considered out-of-date.
if (it == versions_.end())
@@ -116,8 +116,9 @@ PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
return it->second;
}
-bool PluginMetadata::VersionComparator::operator() (const Version& lhs,
- const Version& rhs) const {
+bool PluginMetadata::VersionComparator::operator()(
+ const base::Version& lhs,
+ const base::Version& rhs) const {
// Keep versions ordered by newest (biggest) first.
return lhs.CompareTo(rhs) > 0;
}
« no previous file with comments | « chrome/browser/plugins/plugin_metadata.h ('k') | chrome/browser/plugins/plugin_metadata_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698