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

Simplify the management of objects

Browse source
This commit is contained in:
Cheng Zhao 2015-11-10 20:23:08 +08:00
parent 4f73de0930
commit f9f8a289d9
5 changed files with 58 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brightray/browser/platform_notification_service_impl.cc
View file

@ -24,13 +24,13 @@ PlatformNotificationServiceImpl::PlatformNotificationServiceImpl() {}
PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
NotificationPresenter* PlatformNotificationServiceImpl::notification_presenter() {
#if defined(OS_WIN)
// Bail out if on Windows 7 or even lower, no operating will follow
if (base::win::GetVersion() < base::win::VERSION_WIN8)
return nullptr;
#endif
if (!notification_presenter_) {
#if defined(OS_WIN)
// Bail out if on Windows 7 or even lower, no operating will follow
if (base::win::GetVersion() < base::win::VERSION_WIN8) {
return notification_presenter_.get();
}
#endif
// Create a new presenter if on OS X, Linux, or Windows 8+
notification_presenter_.reset(NotificationPresenter::Create());
}

34
brightray/browser/win/notification_presenter_win.cc
View file

@ -21,13 +21,21 @@ using namespace ABI::Windows::Foundation;
namespace brightray {
namespace {
void RemoveNotification(base::WeakPtr<WindowsToastNotification> notification) {
if (notification)
notification->DismissNotification();
}
} // namespace
// static
NotificationPresenter* NotificationPresenter::Create() {
return new NotificationPresenterWin;
}
NotificationPresenterWin::NotificationPresenterWin() {
m_lastNotification = nullptr;
}
NotificationPresenterWin::~NotificationPresenterWin() {
@ -38,28 +46,14 @@ void NotificationPresenterWin::ShowNotification(
const SkBitmap& icon,
scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) {
std::wstring title = data.title;
std::wstring body = data.body;
std::string iconPath = data.icon.spec();
std::string appName = GetApplicationName();
// toast notification supported in version >= Windows 8
// for prior versions, use Tray.displayBalloon
if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
wtn = new WindowsToastNotification(appName.c_str(), delegate.Pass());
wtn->ShowNotification(title, body, iconPath, m_lastNotification);
}
// This class manages itself.
auto notification = new WindowsToastNotification(
GetApplicationName(), delegate.Pass());
notification->ShowNotification(data.title, data.body, data.icon.spec());
if (cancel_callback) {
*cancel_callback = base::Bind(
&NotificationPresenterWin::RemoveNotification,
base::Unretained(this));
}
}
void NotificationPresenterWin::RemoveNotification() {
if (m_lastNotification != nullptr && wtn != NULL) {
wtn->DismissNotification(m_lastNotification);
&RemoveNotification, notification->GetWeakPtr());
}
}

11
brightray/browser/win/notification_presenter_win.h
View file

@ -16,16 +16,10 @@
#ifndef BRIGHTRAY_BROWSER_WIN_NOTIFICATION_PRESENTER_WIN_H_
#define BRIGHTRAY_BROWSER_WIN_NOTIFICATION_PRESENTER_WIN_H_
#include <windows.ui.notifications.h>
#include <wrl/implements.h>
#include "base/compiler_specific.h"
#include "browser/notification_presenter.h"
namespace brightray {
class WindowsToastNotification;
class NotificationPresenterWin : public NotificationPresenter {
public:
NotificationPresenterWin();
@ -37,11 +31,8 @@ class NotificationPresenterWin : public NotificationPresenter {
scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override;
void RemoveNotification();
private:
WindowsToastNotification* wtn;
Microsoft::WRL::ComPtr<ABI::Windows::UI::Notifications::IToastNotification> m_lastNotification;
DISALLOW_COPY_AND_ASSIGN(NotificationPresenterWin);
};
} // namespace

25
brightray/browser/win/windows_toast_notification.cc
View file

@ -21,9 +21,10 @@ HRESULT init = Windows::Foundation::Initialize(RO_INIT_MULTITHREADED);
} // namespace
WindowsToastNotification::WindowsToastNotification(
const char* app_name,
const std::string& app_name,
scoped_ptr<content::DesktopNotificationDelegate> delegate)
: delegate_(delegate.Pass()) {
: delegate_(delegate.Pass()),
weak_factory_(this) {
ScopedHString toast_manager_str(
RuntimeClass_Windows_UI_Notifications_ToastNotificationManager);
if (!toast_manager_str.success())
@ -46,8 +47,7 @@ WindowsToastNotification::~WindowsToastNotification() {
void WindowsToastNotification::ShowNotification(
const std::wstring& title,
const std::wstring& msg,
std::string icon_path,
ComPtr<IToastNotification>& toast) {
std::string icon_path) {
ComPtr<IXmlDocument> toast_xml;
if(FAILED(GetToastXml(toast_manager_.Get(), title, msg, icon_path, &toast_xml)))
return;
@ -57,25 +57,26 @@ void WindowsToastNotification::ShowNotification(
if (!toast_str.success())
return;
ComPtr<IToastNotificationFactory> toastFactory;
if (FAILED(Windows::Foundation::GetActivationFactory(toast_str, &toastFactory)))
ComPtr<IToastNotificationFactory> toast_factory;
if (FAILED(Windows::Foundation::GetActivationFactory(toast_str,
&toast_factory)))
return;
if (FAILED(toastFactory->CreateToastNotification(toast_xml.Get(), &toast)))
if (FAILED(toast_factory->CreateToastNotification(toast_xml.Get(),
&toast_notification_)))
return;
if (FAILED(SetupCallbacks(toast.Get())))
if (FAILED(SetupCallbacks(toast_notification_.Get())))
return;
if (FAILED(toast_notifier_->Show(toast.Get())))
if (FAILED(toast_notifier_->Show(toast_notification_.Get())))
return;
delegate_->NotificationDisplayed();
}
void WindowsToastNotification::DismissNotification(
ComPtr<IToastNotification> toast) {
toast_notifier_->Hide(toast.Get());
void WindowsToastNotification::DismissNotification() {
toast_notifier_->Hide(toast_notification_.Get());
}
void WindowsToastNotification::NotificationClicked() {

36
brightray/browser/win/windows_toast_notification.h
View file

@ -11,6 +11,7 @@
#include <wrl/implements.h>
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/desktop_notification_delegate.h"
#include "content/public/common/platform_notification_data.h"
@ -27,28 +28,27 @@ using DesktopToastActivatedEventHandler =
using DesktopToastDismissedEventHandler =
ITypedEventHandler<ToastNotification*, ToastDismissedEventArgs*>;
class ToastEventHandler;
class WindowsToastNotification {
public:
WindowsToastNotification(
const char* app_name,
const std::string& app_name,
scoped_ptr<content::DesktopNotificationDelegate> delegate);
~WindowsToastNotification();
void ShowNotification(const std::wstring& title,
const std::wstring& msg,
std::string icon_path,
ComPtr<IToastNotification>& toast);
void DismissNotification(ComPtr<IToastNotification> toast);
void NotificationClicked();
void NotificationDismissed();
std::string icon_path);
void DismissNotification();
base::WeakPtr<WindowsToastNotification> GetWeakPtr() {
return weak_factory_.GetWeakPtr();
}
private:
scoped_ptr<content::DesktopNotificationDelegate> delegate_;
ComPtr<ToastEventHandler> event_handler_;
ComPtr<IToastNotificationManagerStatics> toast_manager_;
ComPtr<IToastNotifier> toast_notifier_;
friend class ToastEventHandler;
void NotificationClicked();
void NotificationDismissed();
bool GetToastXml(IToastNotificationManagerStatics* toastManager,
const std::wstring& title,
@ -70,6 +70,16 @@ class WindowsToastNotification {
ABI::Windows::Data::Xml::Dom::IXmlNode* node,
const std::wstring& text);
bool SetupCallbacks(IToastNotification* toast);
scoped_ptr<content::DesktopNotificationDelegate> delegate_;
ComPtr<ToastEventHandler> event_handler_;
ComPtr<IToastNotificationManagerStatics> toast_manager_;
ComPtr<IToastNotifier> toast_notifier_;
ComPtr<IToastNotification> toast_notification_;
base::WeakPtrFactory<WindowsToastNotification> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(WindowsToastNotification);
};
@ -85,6 +95,8 @@ class ToastEventHandler : public RuntimeClass<RuntimeClassFlags<ClassicCom>,
private:
WindowsToastNotification* notification_; // weak ref.
DISALLOW_COPY_AND_ASSIGN(ToastEventHandler);
};
} // namespace brightray