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

Refactor for NotificationResources bitmaps

Browse source 
SkBitmap icon moves into content::NotificationResources
This commit is contained in:
Brian R. Bondy 2016-04-26 22:52:26 -04:00 • committed by Cheng Zhao
parent 9d31297d27
commit 23eda6930a
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
brightray/browser/platform_notification_service.cc
View file

@ -9,6 +9,7 @@
#include "browser/notification_delegate_adapter.h" #include "browser/notification_delegate_adapter.h"
#include "browser/notification_presenter.h" #include "browser/notification_presenter.h"
#include "content/public/common/platform_notification_data.h" #include "content/public/common/platform_notification_data.h"
#include "content/public/common/notification_resources.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
namespace brightray { namespace brightray {
@ -70,24 +71,26 @@ blink::WebNotificationPermission PlatformNotificationService::CheckPermissionOnI
void PlatformNotificationService::DisplayNotification( void PlatformNotificationService::DisplayNotification(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
const GURL& origin, const GURL& origin,
const SkBitmap& icon, const content::PlatformNotificationData& notification_data,
const content::PlatformNotificationData& data, const content::NotificationResources& notification_resources,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) { base::Closure* cancel_callback) {
browser_client_->WebNotificationAllowed( browser_client_->WebNotificationAllowed(
render_process_id_, render_process_id_,
base::Bind(&OnWebNotificationAllowed, base::Bind(&OnWebNotificationAllowed,
browser_client_, icon, data, browser_client_,
notification_resources.notification_icon,
notification_data,
base::Passed(&delegate), base::Passed(&delegate),
cancel_callback)); cancel_callback));
} }
void PlatformNotificationService::DisplayPersistentNotification( void PlatformNotificationService::DisplayPersistentNotification(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
int64_t service_worker_registration_id, int64_t persistent_notification_id,
const GURL& origin, const GURL& origin,
const SkBitmap& icon, const content::PlatformNotificationData& notification_data,
const content::PlatformNotificationData& notification_data) { const content::NotificationResources& notification_resources) {
} }
void PlatformNotificationService::ClosePersistentNotification( void PlatformNotificationService::ClosePersistentNotification(

11
brightray/browser/platform_notification_service.h
View file

@ -27,19 +27,18 @@ class PlatformNotificationService
content::ResourceContext* resource_context, content::ResourceContext* resource_context,
const GURL& origin, const GURL& origin,
int render_process_id) override; int render_process_id) override;
void DisplayNotification( void DisplayNotification(content::BrowserContext* browser_context,
content::BrowserContext* browser_context,
const GURL& origin, const GURL& origin,
const SkBitmap& icon,
const content::PlatformNotificationData& notification_data, const content::PlatformNotificationData& notification_data,
const content::NotificationResources& notification_resources,
scoped_ptr<content::DesktopNotificationDelegate> delegate, scoped_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) override; base::Closure* cancel_callback) override;
void DisplayPersistentNotification( void DisplayPersistentNotification(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
int64_t service_worker_registration_id, int64_t persistent_notification_id,
const GURL& origin, const GURL& origin,
const SkBitmap& icon, const content::PlatformNotificationData& notification_data,
const content::PlatformNotificationData& notification_data) override; const content::NotificationResources& notification_resources) override;
void ClosePersistentNotification( void ClosePersistentNotification(
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
int64_t persistent_notification_id) override; int64_t persistent_notification_id) override;