mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
Fix compilation on Linux
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "content/public/browser/desktop_notification_delegate.h"
|
||||
#include "content/public/common/show_desktop_notification_params.h"
|
||||
#include "content/public/common/platform_notification_data.h"
|
||||
#include "common/application_info.h"
|
||||
|
||||
namespace brightray {
|
||||
@@ -51,11 +51,11 @@ NotificationPresenterLinux::~NotificationPresenterLinux() {
|
||||
}
|
||||
|
||||
void NotificationPresenterLinux::ShowNotification(
|
||||
const content::ShowDesktopNotificationHostMsgParams& params,
|
||||
const content::PlatformNotificationData& data,
|
||||
scoped_ptr<content::DesktopNotificationDelegate> delegate_ptr,
|
||||
base::Closure* cancel_callback) {
|
||||
std::string title = base::UTF16ToUTF8(params.title);
|
||||
std::string body = base::UTF16ToUTF8(params.body);
|
||||
std::string title = base::UTF16ToUTF8(data.title);
|
||||
std::string body = base::UTF16ToUTF8(data.body);
|
||||
NotifyNotification* notification = notify_notification_new(title.c_str(), body.c_str(), nullptr);
|
||||
|
||||
content::DesktopNotificationDelegate* delegate = delegate_ptr.release();
|
||||
|
||||
@@ -25,8 +25,8 @@ class NotificationPresenterLinux : public NotificationPresenter {
|
||||
|
||||
private:
|
||||
// NotificationPresenter:
|
||||
virtual void ShowNotification(
|
||||
const content::ShowDesktopNotificationHostMsgParams&,
|
||||
void ShowNotification(
|
||||
const content::PlatformNotificationData&,
|
||||
scoped_ptr<content::DesktopNotificationDelegate> delegate,
|
||||
base::Closure* cancel_callback) override;
|
||||
|
||||
|
||||
@@ -20,7 +20,8 @@ class NotificationPresenterMac : public NotificationPresenter {
|
||||
NotificationPresenterMac();
|
||||
~NotificationPresenterMac();
|
||||
|
||||
virtual void ShowNotification(
|
||||
// NotificationPresenter:
|
||||
void ShowNotification(
|
||||
const content::PlatformNotificationData&,
|
||||
scoped_ptr<content::DesktopNotificationDelegate> delegate,
|
||||
base::Closure* cancel_callback) override;
|
||||
|
||||
2
brightray/vendor/libchromiumcontent
vendored
2
brightray/vendor/libchromiumcontent
vendored
Submodule brightray/vendor/libchromiumcontent updated: f3f2a0aa42...84b0897b6b
Reference in New Issue
Block a user