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

Unified Diff: chrome/browser/ui/views/status_icons/status_icon_win.cc

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
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_icon_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_icons/status_icon_win.cc
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc
index 9715ed8e340d1141d5fab7a1e2cbfa353643ecdc..105bf487ce5951455d5d1d9963e74167c9dca79a 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc
@@ -11,6 +11,7 @@
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/icon_util.h"
+#include "ui/message_center/notifier_settings.h"
#include "ui/views/controls/menu/menu_runner.h"
////////////////////////////////////////////////////////////////////////////////
@@ -115,9 +116,11 @@ void StatusIconWin::SetToolTip(const base::string16& tool_tip) {
LOG(WARNING) << "Unable to set tooltip for status tray icon";
}
-void StatusIconWin::DisplayBalloon(const gfx::ImageSkia& icon,
- const base::string16& title,
- const base::string16& contents) {
+void StatusIconWin::DisplayBalloon(
+ const gfx::ImageSkia& icon,
+ const base::string16& title,
+ const base::string16& contents,
+ const message_center::NotifierId& notifier_id) {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
icon_data.uFlags = NIF_INFO;
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_icon_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698