chrome/browser/ui/webui/ntp/app_launcher_handler.cc - Issue 398083002: Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled.

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/ui/webui/ntp/app_launcher_handler.cc

Issue 398083002: Add "UninstallReason" parameter to ExtensionRegistryObserver::OnExtensionUninstalled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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/ui/app_list/extension_uninstaller.cc ('K') | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | extensions/browser/api/runtime/runtime_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc

index 8ba4e5c5c0b9239516b54ef33903c427e518658c..8d5293d4eaa63ec6c424e9a9fc80dc405e8f879d 100644

--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc

+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc

@@ -69,6 +69,7 @@ using extensions::Extension;

using extensions::ExtensionPrefs;

using extensions::ExtensionRegistry;

using extensions::ExtensionSet;

+using extensions::UninstalledExtensionInfo;

using extensions::UnloadedExtensionInfo;

namespace {

@@ -286,7 +287,8 @@ void AppLauncherHandler::Observe(int type,

const Extension* extension = NULL;

bool uninstalled = false;

if (type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {

- extension = content::Details<const Extension>(details).ptr();

+ extension = content::Details<extensions::UninstalledExtensionInfo>(

+ details)->extension;

uninstalled = true;

} else { // NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED

if (content::Details<UnloadedExtensionInfo>(details)->reason ==

@@ -794,7 +796,7 @@ void AppLauncherHandler::ExtensionUninstallAccepted() {

extension_service_->UninstallExtension(

extension_id_prompting_,

- ExtensionService::UNINSTALL_REASON_USER_INITIATED,

+ UninstalledExtensionInfo::REASON_USER_INITIATED,

NULL);

CleanupAfterUninstall();

}