chrome/browser/notifications/message_center_notification_manager.cc - Issue 580093003: Factor Google Now welcome notifications out of DesktopNotificationService.

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 580093003: Factor Google Now welcome notifications out of DesktopNotificationService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/notifications/extensions/extension_welcome_notification_factory.cc ('K') | « chrome/browser/notifications/message_center_notification_manager.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')
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 28c5f795178c2f9ee2a680958fdadc54a4e88240..00a804c36b6dc853d02c5a07e3d88bbeec30d7df 100644

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

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

@@ -13,6 +13,8 @@

#include "chrome/browser/extensions/api/notification_provider/notification_provider_api.h"

#include "chrome/browser/notifications/desktop_notification_service.h"

#include "chrome/browser/notifications/desktop_notification_service_factory.h"

+#include "chrome/browser/notifications/extensions/extension_welcome_notification.h"

+#include "chrome/browser/notifications/extensions/extension_welcome_notification_factory.h"

#include "chrome/browser/notifications/fullscreen_notification_blocker.h"

#include "chrome/browser/notifications/message_center_settings_controller.h"

#include "chrome/browser/notifications/notification.h"

@@ -122,7 +124,7 @@ void MessageCenterNotificationManager::Add(const Notification& notification,

if (Update(notification, profile))

return;

- DesktopNotificationServiceFactory::GetForProfile(profile)->

+ ExtensionWelcomeNotificationFactory::GetForBrowserContext(profile)->

ShowWelcomeNotificationIfNecessary(notification);

// WARNING: You MUST update the message center via the notification within a