chrome/browser/extensions/notifications_apitest.cc - Issue 6813116: Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/notifications_apitest.cc

Issue 6813116: Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/extensions/extension_apitest.h"	5 #include "chrome/browser/extensions/extension_apitest.h"

6	6

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

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

9 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

11	10

12 // Flaky, http://crbug.com/42314.	11 // Flaky, http://crbug.com/42314.

13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Notifications) {	12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Notifications) {

14 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)	13 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)

15 // Notifications not supported on linux/views yet.	14 // Notifications not supported on linux/views yet.

16 #else	15 #else

17 ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_;	16 ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_;

18 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest"))	17 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest"))

19 << message_;	18 << message_;

20 DesktopNotificationServiceFactory::GetForProfile(browser()->profile())	19 browser()->profile()->GetDesktopNotificationService()

21 ->GrantPermission(GURL(	20 ->GrantPermission(GURL(

22 "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel"));	21 "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel"));

23 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs"))	22 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs"))

24 << message_;	23 << message_;

25 #endif	24 #endif

26 }	25 }

	26

OLD	NEW

« no previous file with comments | « chrome/browser/desktop_notification_handler.cc ('k') | chrome/browser/notifications/desktop_notification_service.h » ('j') | no next file with comments »