mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

undo some ugly line wrapping

Browse source
This commit is contained in:
Patrick Reynolds 2013-12-19 13:39:37 -06:00
parent df190caefd
commit 8d2b392f07
1 changed files with 36 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
brightray/browser/linux/notification_presenter_linux.cc
View file

@ -31,34 +31,25 @@ void log_and_clear_error(GError *error, const char *context) {
} }
} }
void NotificationClosedCallback(NotifyNotification *notification, void NotificationClosedCallback(NotifyNotification *noti, NotificationPresenterLinux *obj) {
NotificationPresenterLinux *obj) { int render_process_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderProcessIDKey));
int render_process_id = GPOINTER_TO_INT( int render_view_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderViewIDKey));
g_object_get_data(G_OBJECT(notification), kRenderProcessIDKey)); int notification_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kNotificationIDKey));
int render_view_id = GPOINTER_TO_INT(
g_object_get_data(G_OBJECT(notification), kRenderViewIDKey));
int notification_id = GPOINTER_TO_INT(
g_object_get_data(G_OBJECT(notification), kNotificationIDKey));
auto host = auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
content::RenderViewHost::FromID(render_process_id, render_view_id);
if (host) host->DesktopNotificationPostClose(notification_id, false); if (host) host->DesktopNotificationPostClose(notification_id, false);
obj->RemoveNotification(notification); obj->RemoveNotification(noti);
} }
void NotificationViewCallback(NotifyNotification *notification, void NotificationViewCallback(NotifyNotification *noti, const char *action,
const char *action, NotificationPresenterLinux *obj) { NotificationPresenterLinux *obj) {
int render_process_id = GPOINTER_TO_INT( int render_process_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderProcessIDKey));
g_object_get_data(G_OBJECT(notification), kRenderProcessIDKey)); int render_view_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderViewIDKey));
int render_view_id = GPOINTER_TO_INT( int notification_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kNotificationIDKey));
g_object_get_data(G_OBJECT(notification), kRenderViewIDKey));
int notification_id = GPOINTER_TO_INT(
g_object_get_data(G_OBJECT(notification), kNotificationIDKey));
auto host = auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
content::RenderViewHost::FromID(render_process_id, render_view_id);
if (host) host->DesktopNotificationPostClick(notification_id); if (host) host->DesktopNotificationPostClick(notification_id);
obj->RemoveNotification(notification); obj->RemoveNotification(noti);
} }
} // namespace } // namespace
@ -70,8 +61,7 @@ NotificationPresenter* NotificationPresenter::Create() {
return new NotificationPresenterLinux; return new NotificationPresenterLinux;
} }
NotificationPresenterLinux::NotificationPresenterLinux() NotificationPresenterLinux::NotificationPresenterLinux() : notifications_(NULL) { }
: notifications_(NULL) { }
NotificationPresenterLinux::~NotificationPresenterLinux() { NotificationPresenterLinux::~NotificationPresenterLinux() {
// unref any outstanding notifications, and then free the list. // unref any outstanding notifications, and then free the list.
@ -89,27 +79,22 @@ void NotificationPresenterLinux::ShowNotification(
int render_view_id) { int render_view_id) {
std::string title = base::UTF16ToUTF8(params.title); std::string title = base::UTF16ToUTF8(params.title);
std::string body = base::UTF16ToUTF8(params.body); std::string body = base::UTF16ToUTF8(params.body);
NotifyNotification *notification = NotifyNotification *noti = notify_notification_new(title.c_str(), body.c_str(), NULL);
notify_notification_new(title.c_str(), body.c_str(), NULL); g_object_set_data(G_OBJECT(noti), kRenderProcessIDKey, GINT_TO_POINTER(render_process_id));
g_object_set_data(G_OBJECT(notification), g_object_set_data(G_OBJECT(noti), kRenderViewIDKey, GINT_TO_POINTER(render_view_id));
kRenderProcessIDKey, GINT_TO_POINTER(render_process_id)); g_object_set_data(G_OBJECT(noti), kNotificationIDKey, GINT_TO_POINTER(params.notification_id));
g_object_set_data(G_OBJECT(notification), g_signal_connect(noti, "closed",
kRenderViewIDKey, GINT_TO_POINTER(render_view_id));
g_object_set_data(G_OBJECT(notification),
kNotificationIDKey, GINT_TO_POINTER(params.notification_id));
g_signal_connect(notification, "closed",
G_CALLBACK(NotificationClosedCallback), this); G_CALLBACK(NotificationClosedCallback), this);
notify_notification_add_action(notification, "default", "View", notify_notification_add_action(noti, "default", "View",
(NotifyActionCallback)NotificationViewCallback, this, NULL); (NotifyActionCallback)NotificationViewCallback, this, NULL);
notifications_ = g_list_append(notifications_, notification); notifications_ = g_list_append(notifications_, noti);
GError *error = NULL; GError *error = NULL;
notify_notification_show(notification, &error); notify_notification_show(noti, &error);
log_and_clear_error(error, "notify_notification_show"); log_and_clear_error(error, "notify_notification_show");
auto host = auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host) if (!host)
return; return;
@ -120,42 +105,35 @@ void NotificationPresenterLinux::CancelNotification(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int notification_id) { int notification_id) {
NotifyNotification *notification = NULL; NotifyNotification *noti = NULL;
for (GList *p = notifications_; p != NULL; p = p->next) { for (GList *p = notifications_; p != NULL; p = p->next) {
int obj_render_process_id = GPOINTER_TO_INT( int rpid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderProcessIDKey));
g_object_get_data(G_OBJECT(notification), kRenderProcessIDKey)); int rvid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kRenderViewIDKey));
int obj_render_view_id = GPOINTER_TO_INT( int nid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), kNotificationIDKey));
g_object_get_data(G_OBJECT(notification), kRenderViewIDKey)); if (render_process_id == rpid && render_view_id == rvid && notification_id == nid) {
int obj_notification_id = GPOINTER_TO_INT( noti = reinterpret_cast<NotifyNotification*>(p->data);
g_object_get_data(G_OBJECT(notification), kNotificationIDKey));
if (render_process_id == obj_render_process_id
&& render_view_id == obj_render_view_id
&& notification_id == obj_notification_id) {
notification = reinterpret_cast<NotifyNotification*>(p->data);
notifications_ = g_list_delete_link(notifications_, p); notifications_ = g_list_delete_link(notifications_, p);
break; break;
} }
} }
if (!notification) if (!noti)
return; return;
GError *error = NULL; GError *error = NULL;
notify_notification_close(notification, &error); notify_notification_close(noti, &error);
log_and_clear_error(error, "notify_notification_close"); log_and_clear_error(error, "notify_notification_close");
g_object_unref(notification); g_object_unref(noti);
auto host = auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host) if (!host)
return; return;
host->DesktopNotificationPostClose(notification_id, false); host->DesktopNotificationPostClose(notification_id, false);
} }
void NotificationPresenterLinux::RemoveNotification( void NotificationPresenterLinux::RemoveNotification(NotifyNotification *noti) {
NotifyNotification *notification) { notifications_ = g_list_remove(notifications_, noti);
notifications_ = g_list_remove(notifications_, notification); g_object_unref(noti);
g_object_unref(notification);
} }
} // namespace brightray } // namespace brightray