Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1476)

Unified Diff: chrome/browser/notifications/notification_object_proxy.h

Issue 2377553003: Add ShouldDisplayOverFullscreen support to web notifications. (Closed)
Patch Set: Removing previously committed changes from cl (via git pull) Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/notification_object_proxy.h
diff --git a/chrome/browser/notifications/notification_object_proxy.h b/chrome/browser/notifications/notification_object_proxy.h
index a49de01dd64982f3f28334e19561a8c3b4877fd5..18890b84a47acd73d4bc6af1c876cc66069c4758 100644
--- a/chrome/browser/notifications/notification_object_proxy.h
+++ b/chrome/browser/notifications/notification_object_proxy.h
@@ -9,7 +9,8 @@
#include <string>
#include "base/macros.h"
-#include "chrome/browser/notifications/notification_delegate.h"
+#include "chrome/browser/notifications/web_notification_delegate.h"
+#include "url/gurl.h"
Peter Beverloo 2016/09/27 17:17:36 nit: forward declare
bmalcolm 2016/09/27 20:34:36 Done. Also fixed it in persistent_notification_del
namespace content {
class BrowserContext;
@@ -20,13 +21,14 @@ class DesktopNotificationDelegate;
// which corresponds to a notification toast on the desktop. It can be signaled
// when various events occur regarding the desktop notification, and the
// attached JS listeners will be invoked in the renderer or worker process.
-class NotificationObjectProxy : public NotificationDelegate {
+class NotificationObjectProxy : public WebNotificationDelegate {
public:
// Creates a Proxy object with the necessary callback information. The Proxy
// will take ownership of |delegate|.
NotificationObjectProxy(
content::BrowserContext* browser_context,
const std::string& notification_id,
+ const GURL& origin,
std::unique_ptr<content::DesktopNotificationDelegate> delegate);
// NotificationDelegate implementation.
@@ -34,18 +36,13 @@ class NotificationObjectProxy : public NotificationDelegate {
void Close(bool by_user) override;
void Click() override;
void ButtonClick(int button_index) override;
- void SettingsClick() override;
- bool ShouldDisplaySettingsButton() override;
- std::string id() const override;
protected:
~NotificationObjectProxy() override;
private:
- content::BrowserContext* browser_context_;
std::unique_ptr<content::DesktopNotificationDelegate> delegate_;
bool displayed_;
- std::string notification_id_;
DISALLOW_COPY_AND_ASSIGN(NotificationObjectProxy);
};

Powered by Google App Engine
This is Rietveld 408576698