Add version_info::GetVersion() to return a base::Version.
Convert base::Version(version_info::GetVersionNumber()) callers in
chrome/ to use version_info::GetVersion() instead.
Change-Id: Ie09e6e1052654c9023e8a77df9f642389530c659
Reviewed-on: https://chromium-review.googlesource.com/988337
Reviewed-by: Kyle Horimoto <[email protected]>
Commit-Queue: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#547295}diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 3b3388e..906a34b 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -273,7 +273,7 @@
}
std::string current_version_str = version_info::GetVersionNumber();
- base::Version current_version(current_version_str);
+ const base::Version& current_version = version_info::GetVersion();
pref_service->SetString(pref_names::kLastChromeVersion, current_version_str);
// If there was no version string in prefs, assume we're out of date.
@@ -379,14 +379,10 @@
bool ChromeExtensionsBrowserClient::IsMinBrowserVersionSupported(
const std::string& min_version) {
- base::Version browser_version =
- base::Version(version_info::GetVersionNumber());
+ const base::Version& browser_version = version_info::GetVersion();
base::Version browser_min_version(min_version);
- if (browser_version.IsValid() && browser_min_version.IsValid() &&
- browser_min_version.CompareTo(browser_version) > 0) {
- return false;
- }
- return true;
+ return !browser_version.IsValid() || !browser_min_version.IsValid() ||
+ browser_min_version.CompareTo(browser_version) <= 0;
}
ExtensionWebContentsObserver*
