chrome/browser/notifications/notification_options_menu_model.cc - Issue 16625012: Remove ExtensionURLInfo, make security decisions in render process

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/notifications/notification_options_menu_model.cc

Issue 16625012: Remove ExtensionURLInfo, make security decisions in render process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address feedback Created 7 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:

Index: chrome/browser/notifications/notification_options_menu_model.cc

diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc

index 3d2cbea45a7bfbf3689c538df6bf7befab678702..7a11a1a491bd844c391044730d93623821087c8a 100644

--- a/chrome/browser/notifications/notification_options_menu_model.cc

+++ b/chrome/browser/notifications/notification_options_menu_model.cc

@@ -140,8 +140,7 @@ NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon)

ExtensionService* extension_service =

balloon_->profile()->GetExtensionService();

const extensions::Extension* extension =

- extension_service->extensions()->GetExtensionOrAppByURL(

- ExtensionURLInfo(origin));

+ extension_service->extensions()->GetExtensionOrAppByURL(origin);

// We get back no extension here when we show the notification after

// the extension has crashed.

if (extension) {

@@ -192,8 +191,7 @@ string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)

ExtensionService* extension_service =

balloon_->profile()->GetExtensionService();

const extensions::Extension* extension =

- extension_service->extensions()->GetExtensionOrAppByURL(

- ExtensionURLInfo(origin));

+ extension_service->extensions()->GetExtensionOrAppByURL(origin);

if (extension) {

return l10n_util::GetStringUTF16(

extension_service->IsExtensionEnabled(extension->id()) ?

@@ -251,8 +249,7 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id,

break;

case kToggleExtensionCommand: {

const extensions::Extension* extension =

- extension_service->extensions()->GetExtensionOrAppByURL(

- ExtensionURLInfo(origin));

+ extension_service->extensions()->GetExtensionOrAppByURL(origin);

if (extension) {

const std::string& id = extension->id();

if (extension_service->IsExtensionEnabled(id))