| 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..7aee8030b9c7e1b86c56bcd0f7d287f8a3952ca4 100644
|
| --- a/chrome/browser/notifications/notification_object_proxy.cc
|
| +++ b/chrome/browser/notifications/notification_object_proxy.cc
|
| @@ -8,16 +8,25 @@
|
|
|
| #include "base/logging.h"
|
| #include "chrome/browser/notifications/platform_notification_service_impl.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/ui/browser_window.h"
|
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
|
| +#include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "content/public/browser/desktop_notification_delegate.h"
|
| +#include "content/public/browser/web_contents.h"
|
| +
|
| +using content::WebContents;
|
|
|
| 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 +53,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());
|
| }
|
|
|