chrome/browser/notifications/message_center_notification_manager.cc - Issue 514293003: Run athena on chrome

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 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 4 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

« athena/resource_manager/public/DEPS ('K') | « chrome/browser/idle_chromeos.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | chrome/browser/ui/startup/startup_browser_creator.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 2dff84140698940ede0f3affcceec03eaa793a53..17e177fd88109a650310103072644a2b8791fd49 100644

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

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

@@ -76,8 +76,11 @@ MessageCenterNotificationManager::MessageCenterNotificationManager(

message_center_->SetNotifierSettingsProvider(settings_provider_.get());

#if defined(OS_CHROMEOS)

+#if !defined(USE_ATHENA)

+ // TODO(oshima|hashimoto): Support notification on athena. crbug.com/408755.

blockers_.push_back(

new LoginStateNotificationBlockerChromeOS(message_center));

+#endif

#else

blockers_.push_back(new ScreenLockNotificationBlocker(message_center));

#endif

« athena/resource_manager/public/DEPS ('K') | « chrome/browser/idle_chromeos.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | chrome/browser/ui/startup/startup_browser_creator.cc » ('J')