| Index: chrome/browser/notifications/notification_object_proxy.cc
|
| diff --git a/chrome/browser/notifications/notification_object_proxy.cc b/chrome/browser/notifications/notification_object_proxy.cc
|
| index f07a308104e0859c49d04127ffc5e795de0529d1..55a8b848f18719f5fa3a7f0d70c6c649f8b21662 100644
|
| --- a/chrome/browser/notifications/notification_object_proxy.cc
|
| +++ b/chrome/browser/notifications/notification_object_proxy.cc
|
| @@ -9,15 +9,16 @@
|
| #include "base/logging.h"
|
| #include "chrome/browser/notifications/platform_notification_service_impl.h"
|
| #include "content/public/browser/desktop_notification_delegate.h"
|
| +#include "url/gurl.h"
|
|
|
| NotificationObjectProxy::NotificationObjectProxy(
|
| content::BrowserContext* browser_context,
|
| const std::string& notification_id,
|
| + const GURL& origin,
|
| std::unique_ptr<content::DesktopNotificationDelegate> delegate)
|
| - : browser_context_(browser_context),
|
| + : WebNotificationDelegate(browser_context, notification_id, origin),
|
| delegate_(std::move(delegate)),
|
| - displayed_(false),
|
| - notification_id_(notification_id) {}
|
| + displayed_(false) {}
|
|
|
| NotificationObjectProxy::~NotificationObjectProxy() {}
|
|
|
| @@ -44,17 +45,5 @@ void NotificationObjectProxy::ButtonClick(int button_index) {
|
| // Notification buttons not are supported for non persistent notifications.
|
| DCHECK_EQ(button_index, 0);
|
|
|
| - NotificationCommon::OpenNotificationSettings(browser_context_);
|
| -}
|
| -
|
| -void NotificationObjectProxy::SettingsClick() {
|
| - NotificationCommon::OpenNotificationSettings(browser_context_);
|
| -}
|
| -
|
| -bool NotificationObjectProxy::ShouldDisplaySettingsButton() {
|
| - return true;
|
| -}
|
| -
|
| -std::string NotificationObjectProxy::id() const {
|
| - return notification_id_;
|
| + NotificationCommon::OpenNotificationSettings(browser_context());
|
| }
|
|
|