Plumb NotifierId to status icon balloons

chrome/browser/ui/views/status_icons/status_icon_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #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"
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusIconWin, public:
 
 StatusIconWin::StatusIconWin(StatusTrayWin* tray,
                              UINT id,
                              HWND window,
                              UINT message)
     : tray_(tray),
@@ skipping 84 matching lines @@
   // Create the icon.
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_TIP;
   wcscpy_s(icon_data.szTip, tool_tip.c_str());
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     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;
   icon_data.dwInfoFlags = NIIF_INFO;
   wcscpy_s(icon_data.szInfoTitle, title.c_str());
   wcscpy_s(icon_data.szInfo, contents.c_str());
   icon_data.uTimeout = 0;
 
   base::win::Version win_version = base::win::GetVersion();
   if (!icon.isNull() && win_version != base::win::VERSION_PRE_XP) {
@@ skipping 33 matching lines @@
     memset(icon_data, 0, sizeof(NOTIFYICONDATA));
     icon_data->cbSize = sizeof(NOTIFYICONDATA);
   } else {
     memset(icon_data, 0, NOTIFYICONDATA_V3_SIZE);
     icon_data->cbSize = NOTIFYICONDATA_V3_SIZE;
   }
 
   icon_data->hWnd = window_;
   icon_data->uID = icon_id_;
 }