Merge pull request #46 from brightray/linux-notifications

Linux notifications
This commit is contained in:
Patrick Reynolds 2013-12-19 14:01:47 -08:00
commit 37679214d1
4 changed files with 198 additions and 2 deletions

View file

@ -64,6 +64,8 @@
'browser/notification_presenter.h', 'browser/notification_presenter.h',
'browser/notification_presenter_mac.h', 'browser/notification_presenter_mac.h',
'browser/notification_presenter_mac.mm', 'browser/notification_presenter_mac.mm',
'browser/linux/notification_presenter_linux.h',
'browser/linux/notification_presenter_linux.cc',
'browser/url_request_context_getter.cc', 'browser/url_request_context_getter.cc',
'browser/url_request_context_getter.h', 'browser/url_request_context_getter.h',
'browser/win/devtools_window.cc', 'browser/win/devtools_window.cc',
@ -93,7 +95,7 @@
'libraries': [ 'libraries': [
'<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumcontent.so', '<(brightray_source_root)/<(libchromiumcontent_library_dir)/libchromiumcontent.so',
'-lpthread', '-lpthread',
'<!@(pkg-config --libs gtk+-2.0)', '<!@(pkg-config --libs gtk+-2.0 libnotify)',
], ],
}, },
}], }],

View file

@ -35,7 +35,7 @@ BrowserContext* BrowserClient::browser_context() {
} }
NotificationPresenter* BrowserClient::notification_presenter() { NotificationPresenter* BrowserClient::notification_presenter() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX) || defined(OS_LINUX)
if (!notification_presenter_) if (!notification_presenter_)
notification_presenter_.reset(NotificationPresenter::Create()); notification_presenter_.reset(NotificationPresenter::Create());
#endif #endif

View file

@ -0,0 +1,148 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright (c) 2013 Patrick Reynolds <piki@github.com>. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#include <libnotify/notify.h>
#include "browser/linux/notification_presenter_linux.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/common/show_desktop_notification_params.h"
#include "common/application_info.h"
namespace brightray {
namespace {
const char *kRenderProcessIDKey = "RenderProcessID";
const char *kRenderViewIDKey = "RenderViewID";
const char *kNotificationIDKey = "NotificationID";
void log_and_clear_error(GError *error, const char *context) {
if (!error) return;
LOG(ERROR) << context
<< ": domain=" << error->domain
<< " code=" << error->code
<< " message=\"" << error->message << '"';
g_error_free(error);
}
int GetObjectInt(NotifyNotification *noti, const char *key) {
return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), key));
}
void SetObjectInt(NotifyNotification *noti, const char *key, int value) {
g_object_set_data(G_OBJECT(noti), key, GINT_TO_POINTER(value));
}
void NotificationClosedCallback(NotifyNotification *noti, NotificationPresenterLinux *obj) {
int render_process_id = GetObjectInt(noti, kRenderProcessIDKey);
int render_view_id = GetObjectInt(noti, kRenderViewIDKey);
int notification_id = GetObjectInt(noti, kNotificationIDKey);
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (host) host->DesktopNotificationPostClose(notification_id, false);
obj->RemoveNotification(noti);
}
void NotificationViewCallback(NotifyNotification *noti, const char *action,
NotificationPresenterLinux *obj) {
int render_process_id = GetObjectInt(noti, kRenderProcessIDKey);
int render_view_id = GetObjectInt(noti, kRenderViewIDKey);
int notification_id = GetObjectInt(noti, kNotificationIDKey);
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (host) host->DesktopNotificationPostClick(notification_id);
obj->RemoveNotification(noti);
}
} // namespace
NotificationPresenter* NotificationPresenter::Create() {
if (!notify_is_initted()) {
notify_init(GetApplicationName().c_str());
}
return new NotificationPresenterLinux;
}
NotificationPresenterLinux::NotificationPresenterLinux() : notifications_(nullptr) { }
NotificationPresenterLinux::~NotificationPresenterLinux() {
// unref any outstanding notifications, and then free the list.
if (!notifications_) return;
for (GList *p = notifications_; p != nullptr; p = p->next) {
g_object_unref(G_OBJECT(p->data));
}
g_list_free(notifications_);
}
void NotificationPresenterLinux::ShowNotification(
const content::ShowDesktopNotificationHostMsgParams& params,
int render_process_id,
int render_view_id) {
std::string title = base::UTF16ToUTF8(params.title);
std::string body = base::UTF16ToUTF8(params.body);
NotifyNotification *noti = notify_notification_new(title.c_str(), body.c_str(), nullptr);
SetObjectInt(noti, kRenderProcessIDKey, render_process_id);
SetObjectInt(noti, kRenderViewIDKey, render_view_id);
SetObjectInt(noti, kNotificationIDKey, params.notification_id);
g_signal_connect(noti, "closed",
G_CALLBACK(NotificationClosedCallback), this);
notify_notification_add_action(noti, "default", "View",
(NotifyActionCallback)NotificationViewCallback, this, nullptr);
notifications_ = g_list_append(notifications_, noti);
GError *error = nullptr;
notify_notification_show(noti, &error);
log_and_clear_error(error, "notify_notification_show");
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host)
return;
host->DesktopNotificationPostDisplay(params.notification_id);
}
void NotificationPresenterLinux::CancelNotification(
int render_process_id,
int render_view_id,
int notification_id) {
NotifyNotification *noti = nullptr;
for (GList *p = notifications_; p != nullptr; p = p->next) {
int rpid = GetObjectInt(noti, kRenderProcessIDKey);
int rvid = GetObjectInt(noti, kRenderViewIDKey);
int nid = GetObjectInt(noti, kNotificationIDKey);
if (render_process_id == rpid && render_view_id == rvid && notification_id == nid) {
noti = reinterpret_cast<NotifyNotification*>(p->data);
notifications_ = g_list_delete_link(notifications_, p);
break;
}
}
if (!noti)
return;
GError *error = nullptr;
notify_notification_close(noti, &error);
log_and_clear_error(error, "notify_notification_close");
g_object_unref(noti);
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host)
return;
host->DesktopNotificationPostClose(notification_id, false);
}
void NotificationPresenterLinux::RemoveNotification(NotifyNotification *noti) {
notifications_ = g_list_remove(notifications_, noti);
g_object_unref(noti);
}
} // namespace brightray

View file

@ -0,0 +1,46 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright (c) 2013 Patrick Reynolds <piki@github.com>. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE-CHROMIUM file.
#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
#include <libnotify/notify.h>
#include <map>
#include "base/compiler_specific.h"
#include "browser/notification_presenter.h"
namespace brightray {
class NotificationPresenterLinux : public NotificationPresenter {
public:
NotificationPresenterLinux();
~NotificationPresenterLinux();
void RemoveNotification(NotifyNotification *notification);
private:
virtual void ShowNotification(
const content::ShowDesktopNotificationHostMsgParams&,
int render_process_id,
int render_view_id) OVERRIDE;
virtual void CancelNotification(
int render_process_id,
int render_view_id,
int notification_id) OVERRIDE;
// A list of all open NotifyNotification objects.
// We do lookups here both by NotifyNotification object (when the user
// clicks a notification) and by the <process,view,notification> ID
// tuple (when the browser asks to dismiss a notification). So it's not
// a map.
// Entries in this list count as refs, so removal from this list should
// always go with g_object_unref().
GList *notifications_;
};
} // namespace brightray
#endif