Source/WebKit/chromium/src/NotificationPresenterImpl.h - Issue 12086041: Merge 140928

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: Source/WebKit/chromium/src/NotificationPresenterImpl.h

Issue 12086041: Merge 140928 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « LayoutTests/fast/notifications/notifications-constructor-request-permission-expected.txt ('k') | Source/WebKit/chromium/src/NotificationPresenterImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 // WebCore::NotificationPresenter implementation.	53 // WebCore::NotificationPresenter implementation.

54 virtual bool show(WebCore::Notification* object);	54 virtual bool show(WebCore::Notification* object);

55 virtual void cancel(WebCore::Notification* object);	55 virtual void cancel(WebCore::Notification* object);

56 virtual void notificationObjectDestroyed(WebCore::Notification* object);	56 virtual void notificationObjectDestroyed(WebCore::Notification* object);

57 virtual void notificationControllerDestroyed();	57 virtual void notificationControllerDestroyed();

58 virtual WebCore::NotificationClient::Permission checkPermission(WebCore::Scr iptExecutionContext*);	58 virtual WebCore::NotificationClient::Permission checkPermission(WebCore::Scr iptExecutionContext*);

59 #if ENABLE(LEGACY_NOTIFICATIONS)	59 #if ENABLE(LEGACY_NOTIFICATIONS)

60 virtual void requestPermission(WebCore::ScriptExecutionContext*, WTF::PassRe fPtr<WebCore::VoidCallback> callback);	60 virtual void requestPermission(WebCore::ScriptExecutionContext*, WTF::PassRe fPtr<WebCore::VoidCallback> callback);

61 #endif	61 #endif

62 #if ENABLE(NOTIFICATIONS)	62 #if ENABLE(NOTIFICATIONS)

63 virtual void requestPermission(WebCore::ScriptExecutionContext*, WTF::PassRe fPtr<WebCore::NotificationPermissionCallback> callback) { }	63 virtual void requestPermission(WebCore::ScriptExecutionContext*, WTF::PassRe fPtr<WebCore::NotificationPermissionCallback>);

64 #endif	64 #endif

65 virtual void cancelRequestsForPermission(WebCore::ScriptExecutionContext*) { }	65 virtual void cancelRequestsForPermission(WebCore::ScriptExecutionContext*) { }

66	66

67 private:	67 private:

68 // WebNotificationPresenter that this object delegates to.	68 // WebNotificationPresenter that this object delegates to.

69 WebNotificationPresenter* m_presenter;	69 WebNotificationPresenter* m_presenter;

70 };	70 };

71	71

72 } // namespace WebKit	72 } // namespace WebKit

73	73

74 #endif // ENABLE(NOTIFICATIONS) \|\| ENABLE(LEGACY_NOTIFICATIONS)	74 #endif // ENABLE(NOTIFICATIONS) \|\| ENABLE(LEGACY_NOTIFICATIONS)

75	75

76 #endif	76 #endif

OLD	NEW