chrome/browser/extensions/extension_service.cc - Issue 904943003: Fixes component extension commands assignment on reload.

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/extension_service.cc

Issue 904943003: Fixes component extension commands assignment on reload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/extension_keybinding_apitest.cc ('k') | chrome/test/data/extensions/api_test/keybinding/component/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

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

index ef2d572e69b1588a48ed075f8dfb4d78967b097f..3e3d06a3ec20ebea1b378b45d8d89fe50d2a76ad 100644

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

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

@@ -696,11 +696,12 @@ bool ExtensionService::UninstallExtension(

// we don't do this.

bool external_uninstall =

(reason == extensions::UNINSTALL_REASON_INTERNAL_MANAGEMENT) ||

+ (reason == extensions::UNINSTALL_REASON_COMPONENT_REMOVED) ||

(reason == extensions::UNINSTALL_REASON_REINSTALL) ||

(reason == extensions::UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION) ||

(reason == extensions::UNINSTALL_REASON_ORPHANED_SHARED_MODULE) ||

(reason == extensions::UNINSTALL_REASON_SYNC &&

- extension->was_installed_by_custodian());

+ extension->was_installed_by_custodian());

if (!external_uninstall &&

(!by_policy->UserMayModifySettings(extension.get(), error) ||

by_policy->MustRemainInstalled(extension.get(), error))) {

@@ -1395,7 +1396,7 @@ void ExtensionService::RemoveComponentExtension(

content::Source<Profile>(profile_),

content::Details<const Extension>(extension.get()));

ExtensionRegistry::Get(profile_)->TriggerOnUninstalled(

- extension.get(), extensions::UNINSTALL_REASON_INTERNAL_MANAGEMENT);

+ extension.get(), extensions::UNINSTALL_REASON_COMPONENT_REMOVED);

}