chrome/browser/notifications/notification_options_menu_model.cc - Issue 10375021: Move Extension into extensions namespace

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 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Take 6 Created 8 years, 7 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/notifications/desktop_notification_service.cc ('k') | chrome/browser/password_manager/password_store_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 33c1f00d01cfecf12977eda40ee0bc7a418c3c3f..b598ac8ef5d8ef79442039ee691bd0b9d36fac1f 100644

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

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

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

if (origin.SchemeIs(chrome::kExtensionScheme)) {

ExtensionService* extension_service =

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

- const Extension* extension =

+ const extensions::Extension* extension =

extension_service->extensions()->GetExtensionOrAppByURL(

ExtensionURLInfo(origin));

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

@@ -176,7 +176,7 @@ string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)

if (origin.SchemeIs(chrome::kExtensionScheme)) {

ExtensionService* extension_service =

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

- const Extension* extension =

+ const extensions::Extension* extension =

extension_service->extensions()->GetExtensionOrAppByURL(

ExtensionURLInfo(origin));

if (extension) {

@@ -234,14 +234,14 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {

service->GrantPermission(origin);

break;

case kToggleExtensionCommand: {

- const Extension* extension =

+ const extensions::Extension* extension =

extension_service->extensions()->GetExtensionOrAppByURL(

ExtensionURLInfo(origin));

if (extension) {

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

if (extension_service->IsExtensionEnabled(id))

extension_service->DisableExtension(

- id, Extension::DISABLE_USER_ACTION);

+ id, extensions::Extension::DISABLE_USER_ACTION);

else

extension_service->EnableExtension(id);

}