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

Fix compilation on Linux

Browse source
This commit is contained in:
Cheng Zhao 2015-03-14 18:34:53 +00:00
parent 6033e5bea3
commit 54e58ae255
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "content/public/browser/desktop_notification_delegate.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" #include "common/application_info.h"
namespace brightray { namespace brightray {
@ -51,11 +51,11 @@ NotificationPresenterLinux::~NotificationPresenterLinux() {
} }
void NotificationPresenterLinux::ShowNotification( void NotificationPresenterLinux::ShowNotification(
const content::ShowDesktopNotificationHostMsgParams& params, const content::PlatformNotificationData& data,
scoped_ptr<content::DesktopNotificationDelegate> delegate_ptr, scoped_ptr<content::DesktopNotificationDelegate> delegate_ptr,
base::Closure* cancel_callback) { base::Closure* cancel_callback) {
std::string title = base::UTF16ToUTF8(params.title); std::string title = base::UTF16ToUTF8(data.title);
std::string body = base::UTF16ToUTF8(params.body); std::string body = base::UTF16ToUTF8(data.body);
NotifyNotification* notification = notify_notification_new(title.c_str(), body.c_str(), nullptr); NotifyNotification* notification = notify_notification_new(title.c_str(), body.c_str(), nullptr);
content::DesktopNotificationDelegate* delegate = delegate_ptr.release(); content::DesktopNotificationDelegate* delegate = delegate_ptr.release();

4
brightray/browser/linux/notification_presenter_linux.h
View file

@ -25,8 +25,8 @@ class NotificationPresenterLinux : public NotificationPresenter {
private: private:
// NotificationPresenter: // NotificationPresenter:
virtual void ShowNotification( void ShowNotification(
const content::ShowDesktopNotificationHostMsgParams&, const content::PlatformNotificationData&,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override; base::Closure* cancel_callback) override;

3
brightray/browser/notification_presenter_mac.h
View file

@ -20,7 +20,8 @@ class NotificationPresenterMac : public NotificationPresenter {
NotificationPresenterMac(); NotificationPresenterMac();
~NotificationPresenterMac(); ~NotificationPresenterMac();
virtual void ShowNotification( // NotificationPresenter:
void ShowNotification(
const content::PlatformNotificationData&, const content::PlatformNotificationData&,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override; base::Closure* cancel_callback) override;

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit f3f2a0aa429523a45dfb943c05106fa68fb26c44 Subproject commit 84b0897b6bf21d75ff03a1916513259aeb284252