Make //content responsible for generating notification Ids

chrome/browser/notifications/message_center_notification_manager.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/notifications/message_center_notification_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/shell.h"
 #endif
 
+using message_center::NotifierId;
 
 MessageCenterNotificationManager::MessageCenterNotificationManager(
     message_center::MessageCenter* message_center,
     std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider)
     : message_center_(message_center),
       settings_provider_(std::move(settings_provider)),
       system_observer_(this),
       stats_collector_(message_center),
       google_now_stats_collector_(message_center) {
   message_center_->AddObserver(this);
@@ skipping 93 matching lines @@
       // Delete the old one after the new one is created to ensure we don't run
       // out of KeepAlives.
       delete old_notification;
       profile_notifications_.erase(old_id);
       profile_notifications_[new_notification->notification().id()] =
           new_notification;
 
       // TODO(liyanhou): Add routing updated notifications to alternative
       // providers.
 
+      // Non-persistent Web Notifications rely on receiving the Display() event
+      // to inform the developer, even when replacing a previous notification.
+      if (notification.notifier_id().type == NotifierId::WEB_PAGE)
+        notification.delegate()->Display();
+
       // WARNING: You MUST use AddProfileNotification or update the message
       // center via the notification within a ProfileNotification object or the
       // profile ID will not be correctly set for ChromeOS.
       message_center_->UpdateNotification(
           old_id, base::WrapUnique(new message_center::Notification(
                       new_notification->notification())));
 
       return true;
     }
   }
@@ skipping 209 matching lines @@
        it != registry->enabled_extensions().end();
        ++it) {
     if ((*it->get()).permissions_data()->HasAPIPermission(
             extensions::APIPermission::ID::kNotificationProvider)) {
       extension_id = (*it->get()).id();
       return extension_id;
     }
   }
   return extension_id;
 }