diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 05:44:26 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 05:44:26 +0000 |
| commit | 4bb33630869981809c47c36c3c18813d6b005d34 (patch) | |
| tree | 505252dfeac2de2d02a89d1f7e69ffcdf4affcf5 /chrome/common | |
| parent | a93244407e205a8619d620ce91bafbdf88eab195 (diff) | |
| download | chromium_src-4bb33630869981809c47c36c3c18813d6b005d34.zip chromium_src-4bb33630869981809c47c36c3c18813d6b005d34.tar.gz chromium_src-4bb33630869981809c47c36c3c18813d6b005d34.tar.bz2 | |
Browser side support (sans UI) for desktop notifications.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/194108
Review URL: http://codereview.chromium.org/271052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 2 | ||||
| -rw-r--r-- | chrome/common/render_messages_internal.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index b1104da..ee03bc3 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -281,6 +281,12 @@ const wchar_t kShowOmniboxSearchHint[] = L"browser.show_omnibox_search_hint"; // in a session. const wchar_t kNTPThemePromoRemaining[] = L"browser.ntp.theme_promo_remaining"; +// The list of origins which are allowed|denied to show desktop notifications. +const wchar_t kDesktopNotificationAllowedOrigins[] = + L"profile.notification_allowed_sites"; +const wchar_t kDesktopNotificationDeniedOrigins[] = + L"profile.notification_denied_sites"; + // *************** LOCAL STATE *************** // These are attached to the machine/installation diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 01fb279..f6d62ea 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -112,6 +112,8 @@ extern const wchar_t kCheckDefaultBrowser[]; extern const wchar_t kUseCustomChromeFrame[]; extern const wchar_t kShowOmniboxSearchHint[]; extern const wchar_t kNTPThemePromoRemaining[]; +extern const wchar_t kDesktopNotificationAllowedOrigins[]; +extern const wchar_t kDesktopNotificationDeniedOrigins[]; // Local state extern const wchar_t kMetricsClientID[]; diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 2758c95..d29d41d 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -1701,10 +1701,10 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_MESSAGE_ROUTED1(ViewHostMsg_CancelDesktopNotification, int /* notification_id */ ) IPC_MESSAGE_ROUTED2(ViewHostMsg_RequestNotificationPermission, - string16 /* origin */, + GURL /* origin */, int /* callback_context */) IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_CheckNotificationPermission, - string16 /* origin */, + GURL /* origin */, int /* permission_result */) // Sent if the worker object has sent a ViewHostMsg_CreateDedicatedWorker |