chrome/browser/notifications/message_center_notification_manager.cc - Issue 102103005: Move c/c/e/extension_set to top-level extensions/

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

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years 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/notifications/message_center_settings_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_notification_manager.cc

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

index 2737964ef7b9cf7e6d9b7af51f80037a8d007813..e316ca0f4f57371a271abea773b1db12188969a0 100644

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

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

@@ -19,12 +19,12 @@

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/chrome_pages.h"

#include "chrome/browser/ui/host_desktop.h"

-#include "chrome/common/extensions/extension_set.h"

#include "chrome/common/pref_names.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/url_constants.h"

#include "extensions/browser/info_map.h"

+#include "extensions/common/extension_set.h"

#include "ui/gfx/image/image_skia.h"

#include "ui/message_center/message_center_style.h"

#include "ui/message_center/message_center_tray.h"

@@ -428,14 +428,14 @@ std::string

MessageCenterNotificationManager::ProfileNotification::GetExtensionId() {

extensions::InfoMap* extension_info_map =

extensions::ExtensionSystem::Get(profile())->info_map();

- ExtensionSet extensions;

+ extensions::ExtensionSet extensions;

extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin(

notification().origin_url(), notification().process_id(),

extensions::APIPermission::kNotification, &extensions);

DesktopNotificationService* desktop_service =

DesktopNotificationServiceFactory::GetForProfile(profile());

- for (ExtensionSet::const_iterator iter = extensions.begin();

+ for (extensions::ExtensionSet::const_iterator iter = extensions.begin();

iter != extensions.end(); ++iter) {

if (desktop_service->IsNotifierEnabled(message_center::NotifierId(

message_center::NotifierId::APPLICATION, (*iter)->id()))) {