chrome/browser/extensions/crx_installer.cc - Issue 7003100: Merge 88204 - Partially deprecate the old webstorePrivate.beginInstall method

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 7003100: Merge 88204 - Partially deprecate the old webstorePrivate.beginInstall method (Closed) Base URL: svn://svn.chromium.org/chrome/branches/782/src/

Patch Set: Created 9 years, 6 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/crx_installer.cc

===================================================================

--- chrome/browser/extensions/crx_installer.cc (revision 88605)

+++ chrome/browser/extensions/crx_installer.cc (working copy)

@@ -392,11 +392,10 @@

current_version_ =

frontend_weak_->extension_prefs()->GetVersionString(extension_->id());

- // First see if it's whitelisted by id (the old mechanism).

- bool whitelisted = ClearWhitelistedInstallId(extension_->id()) &&

- extension_->plugins().empty() && is_gallery_install_;

+ // TODO(asargent) - remove this when we fully deprecate the old install api.

+ ClearWhitelistedInstallId(extension_->id());

- // Now check if there's a WhitelistEntry.

+ bool whitelisted = false;

scoped_ptr<CrxInstaller::WhitelistEntry> entry(

RemoveWhitelistEntry(extension_->id()));

if (is_gallery_install_ && entry.get() && original_manifest_.get()) {

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