Refactor notification presenter for new desktop notification interface.

brightray/browser/browser_client.cc

@@ -66,24 +66,12 @@ net::URLRequestContextGetter* BrowserClient::CreateRequestContext(
 
 void BrowserClient::ShowDesktopNotification(
     const content::ShowDesktopNotificationHostMsgParams& params,
-    int render_process_id,
+    content::RenderFrameHost* render_frame_host,
-    int render_view_id,
+    content::DesktopNotificationDelegate* delegate,
-    bool worker) {
+    base::Closure* cancel_callback) {
   auto presenter = notification_presenter();
   if (!presenter)
-    return;
+    presenter->ShowNotification(params, delegate, cancel_callback);
-  presenter->ShowNotification(params, render_process_id, render_view_id);
-}
-
-void BrowserClient::CancelDesktopNotification(
-    int render_process_id,
-    int render_view_id,
-    int notification_id) {
-  auto presenter = notification_presenter();
-  if (!presenter)
-    return;
-  presenter->CancelNotification(
-      render_process_id, render_view_id, notification_id);
 }
 
 content::MediaObserver* BrowserClient::GetMediaObserver() {

brightray/browser/browser_client.h

@@ -43,13 +43,9 @@ class BrowserClient : public content::ContentBrowserClient {
       const content::MainFunctionParams&) OVERRIDE;
   virtual void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams&,
-      int render_process_id,
+      content::RenderFrameHost* render_frame_host,
-      int render_view_id,
+      content::DesktopNotificationDelegate* delegate,
-      bool worker) OVERRIDE;
+      base::Closure* cancel_callback) OVERRIDE;
-  virtual void CancelDesktopNotification(
-      int render_process_id,
-      int render_view_id,
-      int notification_id) OVERRIDE;
   virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
   virtual void GetAdditionalAllowedSchemesForFileSystem(
       std::vector<std::string>* additional_schemes) OVERRIDE;

brightray/browser/linux/notification_presenter_linux.cc

@@ -3,13 +3,12 @@
 // 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/bind.h"
+#include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "common/application_info.h"
 
@@ -17,13 +16,7 @@ namespace brightray {
 
 namespace {
 
-const char *kRenderProcessIDKey = "RenderProcessID";
+void log_and_clear_error(GError* error, const char* context) {
-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
@@ -31,38 +24,15 @@ void log_and_clear_error(GError *error, const char *context) {
   g_error_free(error);
 }
 
-int GetObjectInt(NotifyNotification *noti, const char *key) {
+content::DesktopNotificationDelegate* GetDelegateFromNotification(
-  return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(noti), key));
+    NotifyNotification* notification) {
-}
+  return static_cast<content::DesktopNotificationDelegate*>(
-
+      g_object_get_data(G_OBJECT(notification), "delegate"));
-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
 
+// static
 NotificationPresenter* NotificationPresenter::Create() {
   if (!notify_is_initted()) {
     notify_init(GetApplicationName().c_str());
@@ -70,79 +40,71 @@ NotificationPresenter* NotificationPresenter::Create() {
   return new NotificationPresenterLinux;
 }
 
-NotificationPresenterLinux::NotificationPresenterLinux() : notifications_(nullptr) { }
+NotificationPresenterLinux::NotificationPresenterLinux()
+    : notifications_(nullptr) {
+}
 
 NotificationPresenterLinux::~NotificationPresenterLinux() {
   // unref any outstanding notifications, and then free the list.
-  if (!notifications_) return;
+  if (notifications_)
-
+    g_list_free_full(notifications_, g_object_unref);
-  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,
+    content::DesktopNotificationDelegate* delegate,
-    int render_view_id) {
+    base::Closure* cancel_callback) {
   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);
+  NotifyNotification* notification = 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);
+  g_object_set_data(G_OBJECT(notification), "delegate", delegate);
+  g_signal_connect(notification, "closed", G_CALLBACK(OnNotificationClosedThunk), this);
+  notify_notification_add_action(notification, "default", "View", OnNotificationViewThunk, this,
+                                 nullptr);
 
-  GError *error = nullptr;
+  GError* error = nullptr;
-  notify_notification_show(noti, &error);
+  notify_notification_show(notification, &error);
+  if (error) {
     log_and_clear_error(error, "notify_notification_show");
-
+    delegate->NotificationError();
-  auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!host)
     return;
+  }
 
-  host->DesktopNotificationPostDisplay(params.notification_id);
+  notifications_ = g_list_append(notifications_, notification);
+  delegate->NotificationDisplayed();
+
+  if (cancel_callback)
+    *cancel_callback = base::Bind(
+        &NotificationPresenterLinux::CancelNotification,
+        base::Unretained(this),
+        notification);
 }
 
-void NotificationPresenterLinux::CancelNotification(
+void NotificationPresenterLinux::CancelNotification(NotifyNotification* notification) {
-    int render_process_id,
+  GError* error = nullptr;
-    int render_view_id,
+  notify_notification_close(notification, &error);
-    int notification_id) {
+  if (error)
-  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);
+  GetDelegateFromNotification(notification)->NotificationClosed(false);
-  if (!host)
+  DeleteNotification(notification);
-    return;
-
-  host->DesktopNotificationPostClose(notification_id, false);
 }
 
-void NotificationPresenterLinux::RemoveNotification(NotifyNotification *noti) {
+void NotificationPresenterLinux::DeleteNotification(NotifyNotification* notification) {
-  notifications_ = g_list_remove(notifications_, noti);
+  notifications_ = g_list_remove(notifications_, notification);
-  g_object_unref(noti);
+  g_object_unref(notification);
+}
+
+void NotificationPresenterLinux::OnNotificationClosed(NotifyNotification* notification) {
+  GetDelegateFromNotification(notification)->NotificationClosed(false);
+  DeleteNotification(notification);
+}
+
+void NotificationPresenterLinux::OnNotificationView(
+    NotifyNotification* notification, char* action) {
+  GetDelegateFromNotification(notification)->NotificationClick();
+  DeleteNotification(notification);
 }
 
 }  // namespace brightray

brightray/browser/linux/notification_presenter_linux.h

@@ -7,10 +7,12 @@
 #define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
 
 #include <libnotify/notify.h>
+
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "browser/notification_presenter.h"
+#include "ui/base/glib/glib_signal.h"
 
 namespace brightray {
 
@@ -22,14 +24,18 @@ class NotificationPresenterLinux : public NotificationPresenter {
   void RemoveNotification(NotifyNotification *notification);
 
  private:
+  // NotificationPresenter:
   virtual void ShowNotification(
       const content::ShowDesktopNotificationHostMsgParams&,
-      int render_process_id,
+      content::DesktopNotificationDelegate* delegate,
-      int render_view_id) OVERRIDE;
+      base::Closure* cancel_callback) OVERRIDE;
-  virtual void CancelNotification(
+
-      int render_process_id,
+  void CancelNotification(NotifyNotification* notification);
-      int render_view_id,
+  void DeleteNotification(NotifyNotification* notification);
-      int notification_id) OVERRIDE;
+
+  CHROMEG_CALLBACK_0(NotificationPresenterLinux, void, OnNotificationClosed, NotifyNotification*);
+  CHROMEG_CALLBACK_1(NotificationPresenterLinux, void, OnNotificationView, NotifyNotification*,
+                     char*);
 
   // A list of all open NotifyNotification objects.
   // We do lookups here both by NotifyNotification object (when the user
@@ -38,7 +44,7 @@ class NotificationPresenterLinux : public NotificationPresenter {
   // a map.
   // Entries in this list count as refs, so removal from this list should
   // always go with g_object_unref().
-  GList *notifications_;
+  GList* notifications_;
 };
 
 }  // namespace brightray

brightray/browser/notification_presenter.h

@@ -1,7 +1,10 @@
 #ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_H_
 #define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_H_
 
+#include "base/callback_forward.h"
+
 namespace content {
+class DesktopNotificationDelegate;
 struct ShowDesktopNotificationHostMsgParams;
 }
 
@@ -15,12 +18,8 @@ class NotificationPresenter {
 
   virtual void ShowNotification(
       const content::ShowDesktopNotificationHostMsgParams&,
-      int render_process_id,
+      content::DesktopNotificationDelegate* delegate,
-      int render_view_id) = 0;
+      base::Closure* cancel_callback) = 0;
-  virtual void CancelNotification(
-      int render_process_id,
-      int render_view_id,
-      int notification_id) = 0;
 };
 
 }  // namespace brightray