Fix system notifications incorrectly marked as type WEB_PAGE

chrome/browser/status_icons/desktop_notification_balloon.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/status_icons/desktop_notification_balloon.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/message_center/notification_types.h"
+#include "ui/message_center/notifier_settings.h"
 
 namespace {
 
 void CloseBalloon(const std::string& id, ProfileID profile_id) {
   // The browser process may have gone away during shutting down, in this case
   // notification_ui_manager() will close the balloon in its destructor.
   if (!g_browser_process)
     return;
 
   g_browser_process->notification_ui_manager()->CancelById(id, profile_id);
 }
 
 // Prefix added to the notification ids.
+const char kNotifierId[] = "status-icons.desktop-notification-balloon";
 const char kNotificationPrefix[] = "desktop_notification_balloon.";
 
 // Timeout for automatically dismissing the notification balloon.
 const size_t kTimeoutSeconds = 6;
 
 class DummyNotificationDelegate : public NotificationDelegate {
  public:
   explicit DummyNotificationDelegate(const std::string& id, Profile* profile)
       : id_(kNotificationPrefix + id), profile_(profile) {}
 
@@ skipping 18 matching lines @@
 
 DesktopNotificationBalloon::DesktopNotificationBalloon() : profile_(NULL) {
 }
 
 DesktopNotificationBalloon::~DesktopNotificationBalloon() {
   if (!notification_id_.empty())
     CloseBalloon(notification_id_,
                  NotificationUIManager::GetProfileID(profile_));
 }
 
 void DesktopNotificationBalloon::DisplayBalloon(

[Peter Beverloo, 2015/10/09 10:47:30]

Heh, this class only seems to be used for background mode, yet has a lot of
plumbing to support it. That makes it a nice clean-up target for the future :).

     const gfx::ImageSkia& icon,
     const base::string16& title,
     const base::string16& contents) {
   // Allowing IO access is required here to cover the corner case where
   // there is no last used profile and the default one is loaded.
   // IO access won't be required for normal uses.
   Profile* profile;
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     profile = ProfileManager::GetLastUsedProfile();
   }
 
-  NotificationDelegate* delegate =
+  DummyNotificationDelegate* delegate =
       new DummyNotificationDelegate(base::IntToString(id_count_++), profile_);
-  Notification notification(GURL(), title, contents, gfx::Image(icon),
-      base::string16(), std::string(), delegate);
+  Notification notification(message_center::NOTIFICATION_TYPE_SIMPLE, title,
+      contents, gfx::Image(icon),
+      message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
+                                 kNotifierId),

[Peter Beverloo, 2015/10/09 10:47:30]

This is not great. Theoretically the desktop notification balloon class can be
used by lots of other features, among which status tray icons, all of which
would not fall under a single system component id.

However, also given my earlier comment, I think this is OK for now as long as we
follow up with a clean-up patch. I'll take a stab this afternoon to see how
feasible it is.

Please, at least, call it out explicitly with a comment/TODO.

[johnme, 2015/10/09 11:21:02]

Added TODO explaining this.

+      base::string16(), GURL(), std::string(),
+      message_center::RichNotificationData(), delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, profile);
 
   notification_id_ = notification.delegate_id();
   profile_ = profile;
 }