chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc - Issue 26622003: linux_aura: Turn it on again.

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/ui/views/message_center/web_notification_tray_browsertest.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc ('k') | chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc

diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc

index e1bebd9feee3c68983c47fef25f23cd6ee031007..0f413fa0ff61c628d6de2eaec4255ce34683c7c5 100644

--- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc

+++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc

@@ -187,7 +187,14 @@ IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest,

tray->message_center_delegate_->NumMessageViewsForTest());

}

-IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {

+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)

+// TODO(erg): linux_aura bringup: http://crbug.com/163931

+#define MAYBE_ManyPopupNotifications DISABLED_ManyPopupNotifications

+#else

+#define MAYBE_ManyPopupNotifications ManyPopupNotifications

+#endif

+IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, MAYBE_ManyPopupNotifications) {

scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());

message_center::MessageCenter* message_center = tray->message_center();