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

Unified Diff: chrome/browser/ui/views/ash/balloon_collection_impl_ash.h

Issue 10947046: Eliminate kAshNotifyDisabled and SystemNotification (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit Created 8 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/ui/views/ash/balloon_collection_impl_ash.h
diff --git a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
index 0aa8ce32164411fcd6b2b0de7cad23f229a420fb..648a66734bd30d0e97e72b529fffc7ec69a3428d 100644
--- a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
+++ b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.h
@@ -11,8 +11,8 @@
#include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h" // MessageCallback
#include "chrome/browser/notifications/balloon_collection_impl.h"
-// Wrapper on top of ::BalloonCollectionImpl to provide an interface for
-// chromeos::SystemNotification.
+// Wrapper on top of ::BalloonCollectionImpl to provide integration between
+// the Chrome notification UI and Ash notifications (ash::WebNotificationTray).
class BalloonCollectionImplAsh : public BalloonCollectionImpl,
public ash::WebNotificationTray::Delegate {
public:
@@ -42,13 +42,6 @@ class BalloonCollectionImplAsh : public BalloonCollectionImpl,
const std::string& message,
const chromeos::BalloonViewHost::MessageCallback& callback);
- // Adds a new system notification.
- // |sticky| is ignored in the Ash implementation; desktop notifications
- // are always sticky (i.e. they need to be dismissed explicitly).
- void AddSystemNotification(const Notification& notification,
- Profile* profile,
- bool sticky);
-
// Updates the notification's content. It uses
// NotificationDelegate::id() to check the equality of notifications.
// Returns true if the notification has been updated. False if
@@ -68,10 +61,6 @@ class BalloonCollectionImplAsh : public BalloonCollectionImpl,
const extensions::Extension* GetBalloonExtension(Balloon* balloon);
private:
- // Set of unique ids associated with system notifications, used by
- // MakeBalloon to determine whether or not to enable Web UI.
- std::set<std::string> system_notifications_;
-
DISALLOW_COPY_AND_ASSIGN(BalloonCollectionImplAsh);
};

Powered by Google App Engine
This is Rietveld 408576698