chrome/browser/extensions/external_install_error.cc - Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall 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/external_install_error.cc

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address code review feedback. Created 6 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

« chrome/browser/extensions/extension_service.h ('K') | « chrome/browser/extensions/extension_sync_service.cc ('k') | chrome/browser/extensions/shared_module_service.cc » ('j') | chrome/browser/search/hotword_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/external_install_error.cc

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

index 6b35e5454bfb0e917947cfd0f89379506902db93..49dad4e5ada0b8936329a700938c3ad2d82afa81 100644

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

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

@@ -284,9 +284,10 @@ void ExternalInstallError::InstallUIAbort(bool user_initiated) {

if (user_initiated && GetExtension()) {

ExtensionSystem::Get(browser_context_)

->extension_service()

- ->UninstallExtension(extension_id_,

- false, // Not externally uninstalled.

- NULL); // Ignore error.

+ ->UninstallExtension(

+ extension_id_,

+ ExtensionService::UNINSTALL_REASON_EXTERNAL_INSTALL_CANCELED,

+ NULL); // Ignore error.

// Since the manager listens for the extension to be removed, this will

// remove the error...

} else {