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

Unified Diff: chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm

Issue 1387383004: Plumb NotifierId to status icon balloons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notif_cleanup
Patch Set: Rebase Created 5 years, 2 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/cocoa/status_icons/status_icon_mac.mm
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm
index dbecd2324f1686f14c727f55aaea0cbd39450970..a8ac58994753e444d547700eca374be866907d58 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm
+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm
@@ -12,6 +12,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#import "ui/base/cocoa/menu_controller.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/message_center/notifier_settings.h"
@interface StatusItemController : NSObject {
StatusIconMac* statusIcon_; // weak
@@ -83,10 +84,12 @@ void StatusIconMac::SetToolTip(const base::string16& tool_tip) {
}
}
-void StatusIconMac::DisplayBalloon(const gfx::ImageSkia& icon,
- const base::string16& title,
- const base::string16& contents) {
- notification_.DisplayBalloon(icon, title, contents);
+void StatusIconMac::DisplayBalloon(
+ const gfx::ImageSkia& icon,
+ const base::string16& title,
+ const base::string16& contents,
+ const message_center::NotifierId& notifier_id) {
+ notification_.DisplayBalloon(icon, title, contents, notifier_id);
}
bool StatusIconMac::HasStatusIconMenu() {

Powered by Google App Engine
This is Rietveld 408576698