diff --git a/brightray/browser/linux/libnotify_notification.cc b/brightray/browser/linux/libnotify_notification.cc
index aea7b7cc42d..dad3acb4335 100644
--- a/brightray/browser/linux/libnotify_notification.cc
+++ b/brightray/browser/linux/libnotify_notification.cc
@@ -55,12 +55,6 @@ void log_and_clear_error(GError* error, const char* context) {
 
 }  // namespace
 
-// static
-Notification* Notification::Create(NotificationDelegate* delegate,
-                                   NotificationPresenter* presenter) {
-  return new LibnotifyNotification(delegate, presenter);
-}
-
 // static
 bool LibnotifyNotification::Initialize() {
   if (!libnotify_loader_.Load("libnotify.so.4") &&  // most common one
diff --git a/brightray/browser/linux/notification_presenter_linux.cc b/brightray/browser/linux/notification_presenter_linux.cc
index c846fca6659..25d1b6d982b 100644
--- a/brightray/browser/linux/notification_presenter_linux.cc
+++ b/brightray/browser/linux/notification_presenter_linux.cc
@@ -22,4 +22,8 @@ NotificationPresenterLinux::NotificationPresenterLinux() {
 NotificationPresenterLinux::~NotificationPresenterLinux() {
 }
 
+Notification* NotificationPresenterLinux::CreateNotificationObject(NotificationDelegate* delegate) {
+  return new LibnotifyNotification(delegate, this);
+}
+
 }  // namespace brightray
diff --git a/brightray/browser/linux/notification_presenter_linux.h b/brightray/browser/linux/notification_presenter_linux.h
index ef436799484..b8adcd1348d 100644
--- a/brightray/browser/linux/notification_presenter_linux.h
+++ b/brightray/browser/linux/notification_presenter_linux.h
@@ -16,6 +16,8 @@ class NotificationPresenterLinux : public NotificationPresenter {
   ~NotificationPresenterLinux();
 
  private:
+  Notification* CreateNotificationObject(NotificationDelegate* delegate) override;
+
   DISALLOW_COPY_AND_ASSIGN(NotificationPresenterLinux);
 };
 
diff --git a/brightray/browser/mac/cocoa_notification.mm b/brightray/browser/mac/cocoa_notification.mm
index 4e9ee3238b8..f4599487c84 100644
--- a/brightray/browser/mac/cocoa_notification.mm
+++ b/brightray/browser/mac/cocoa_notification.mm
@@ -12,12 +12,6 @@
 
 namespace brightray {
 
-// static
-Notification* Notification::Create(NotificationDelegate* delegate,
-                                   NotificationPresenter* presenter) {
-  return new CocoaNotification(delegate, presenter);
-}
-
 CocoaNotification::CocoaNotification(NotificationDelegate* delegate,
                                      NotificationPresenter* presenter)
     : Notification(delegate, presenter) {
diff --git a/brightray/browser/mac/notification_presenter_mac.h b/brightray/browser/mac/notification_presenter_mac.h
index 825a1dada23..f6e5f7959c8 100644
--- a/brightray/browser/mac/notification_presenter_mac.h
+++ b/brightray/browser/mac/notification_presenter_mac.h
@@ -22,6 +22,8 @@ class NotificationPresenterMac : public NotificationPresenter {
   ~NotificationPresenterMac();
 
  private:
+  Notification* CreateNotificationObject(NotificationDelegate* delegate) override;
+
   base::scoped_nsobject<NotificationCenterDelegate>
       notification_center_delegate_;
 
diff --git a/brightray/browser/mac/notification_presenter_mac.mm b/brightray/browser/mac/notification_presenter_mac.mm
index a37e9182fc6..a1fb2e77893 100644
--- a/brightray/browser/mac/notification_presenter_mac.mm
+++ b/brightray/browser/mac/notification_presenter_mac.mm
@@ -35,4 +35,8 @@ NotificationPresenterMac::~NotificationPresenterMac() {
   NSUserNotificationCenter.defaultUserNotificationCenter.delegate = nil;
 }
 
+Notification* NotificationPresenterMac::CreateNotificationObject(NotificationDelegate* delegate) {
+  return new CocoaNotification(delegate, this);
+}
+
 }  // namespace brightray
diff --git a/brightray/browser/notification.h b/brightray/browser/notification.h
index 87096bbe263..76e3ba4320f 100644
--- a/brightray/browser/notification.h
+++ b/brightray/browser/notification.h
@@ -47,16 +47,10 @@ class Notification {
  protected:
   Notification(NotificationDelegate* delegate,
                NotificationPresenter* presenter);
+ public:
   virtual ~Notification();
 
  private:
-  friend class NotificationPresenter;
-
-  // Can only be called by NotificationPresenter, the caller is responsible of
-  // freeing the returned instance.
-  static Notification* Create(NotificationDelegate* delegate,
-                              NotificationPresenter* presenter);
-
   NotificationDelegate* delegate_;
   NotificationPresenter* presenter_;
 
diff --git a/brightray/browser/notification_presenter.cc b/brightray/browser/notification_presenter.cc
index ad46e292a27..39c3efd7ddf 100644
--- a/brightray/browser/notification_presenter.cc
+++ b/brightray/browser/notification_presenter.cc
@@ -18,7 +18,8 @@ NotificationPresenter::~NotificationPresenter() {
 
 base::WeakPtr<Notification> NotificationPresenter::CreateNotification(
     NotificationDelegate* delegate) {
-  Notification* notification = Notification::Create(delegate, this);
+  Notification* notification = CreateNotificationObject(delegate);
+  if (!notification) return {};
   notifications_.insert(notification);
   return notification->GetWeakPtr();
 }
diff --git a/brightray/browser/notification_presenter.h b/brightray/browser/notification_presenter.h
index b3dac3005dc..f88a9a6449a 100644
--- a/brightray/browser/notification_presenter.h
+++ b/brightray/browser/notification_presenter.h
@@ -27,6 +27,7 @@ class NotificationPresenter {
 
  protected:
   NotificationPresenter();
+  virtual Notification* CreateNotificationObject(NotificationDelegate* delegate) = 0;
 
  private:
   friend class Notification;
diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc
index c185246809e..5fc961008c9 100644
--- a/brightray/browser/win/notification_presenter_win.cc
+++ b/brightray/browser/win/notification_presenter_win.cc
@@ -66,4 +66,8 @@ base::string16 NotificationPresenterWin::SaveIconToFilesystem(
   return base::UTF8ToUTF16(origin.spec());
 }
 
+Notification* NotificationPresenterWin::CreateNotificationObject(NotificationDelegate* delegate) {
+  return new WindowsToastNotification(delegate, this);
+}
+
 }  // namespace brightray
diff --git a/brightray/browser/win/notification_presenter_win.h b/brightray/browser/win/notification_presenter_win.h
index c3e6a9ad43f..1e1186c500b 100644
--- a/brightray/browser/win/notification_presenter_win.h
+++ b/brightray/browser/win/notification_presenter_win.h
@@ -42,6 +42,8 @@ class NotificationPresenterWin : public NotificationPresenter {
   base::string16 SaveIconToFilesystem(const SkBitmap& icon, const GURL& origin);
 
  private:
+  Notification* CreateNotificationObject(NotificationDelegate* delegate) override;
+
   base::ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPresenterWin);
diff --git a/brightray/browser/win/windows_toast_notification.cc b/brightray/browser/win/windows_toast_notification.cc
index 4a3a5a6f678..0e0c9249c11 100644
--- a/brightray/browser/win/windows_toast_notification.cc
+++ b/brightray/browser/win/windows_toast_notification.cc
@@ -42,12 +42,6 @@ bool GetAppUserModelId(ScopedHString* app_id) {
 
 }  // namespace
 
-// static
-Notification* Notification::Create(NotificationDelegate* delegate,
-                                   NotificationPresenter* presenter) {
-  return new WindowsToastNotification(delegate, presenter);
-}
-
 // static
 ComPtr<ABI::Windows::UI::Notifications::IToastNotificationManagerStatics>
     WindowsToastNotification::toast_manager_;