chrome/browser/extensions/crx_installer.cc - Issue 1575523002: Comparison and streaming operators for base::Version

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1575523002: Comparison and streaming operators for base::Version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes mistake in previous patch set. Created 4 years, 11 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/extensions/chrome_extensions_browser_client.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/crx_installer.cc

diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc

index 372bb926f846d778699965cdc24b9494fb85cfdc..abde058f36ed3f298a9a07185a90e098e4586f61 100644

--- a/chrome/browser/extensions/crx_installer.cc

+++ b/chrome/browser/extensions/crx_installer.cc

@@ -268,7 +268,7 @@ CrxInstallError CrxInstaller::AllowInstall(const Extension* extension) {

}

if (expected_version_.IsValid() && fail_install_if_unexpected_version_ &&

- !expected_version_.Equals(*extension->version())) {

+ expected_version_ != *extension->version()) {

return CrxInstallError(l10n_util::GetStringFUTF16(

IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION,

base::ASCIIToUTF16(expected_version_.GetString()),

@@ -810,7 +810,7 @@ void CrxInstaller::ReportSuccessFromUIThread() {

if ((client_ || allow_silent_install_) &&

grant_permissions_ &&

(!expected_version_.IsValid() ||

- expected_version_.Equals(*extension()->version()))) {

+ expected_version_ == *extension()->version())) {

PermissionsUpdater perms_updater(profile());

perms_updater.InitializePermissions(extension());

perms_updater.GrantActivePermissions(extension());

« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »