Start delegating notifications to MessageCenter on Windows.

chrome/browser/notifications/balloon_notification_ui_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/balloon_notification_ui_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 61 matching lines @@
 
 BalloonCollection* BalloonNotificationUIManager::balloon_collection() {
   return balloon_collection_.get();
 }
 
 NotificationPrefsManager* BalloonNotificationUIManager::prefs_manager() {
   return this;
 }
 
 bool BalloonNotificationUIManager::ShowNotification(
-    const Notification& notification, Profile* profile) {
+    const Notification& notification,
+    Profile* profile) {
   if (!balloon_collection_->HasSpace())
     return false;
   balloon_collection_->Add(notification, profile);
   return true;
 }
 
 void BalloonNotificationUIManager::OnBalloonSpaceChanged() {
   CheckAndShowNotifications();
 }
 
 bool BalloonNotificationUIManager::UpdateNotification(
-    const Notification& notification) {
+    const Notification& notification,
+    Profile* profile) {
   const GURL& origin = notification.origin_url();
   const string16& replace_id = notification.replace_id();
 
   DCHECK(!replace_id.empty());
 
   const BalloonCollection::Balloons& balloons =
       balloon_collection_->GetActiveBalloons();
   for (BalloonCollection::Balloons::const_iterator iter = balloons.begin();
        iter != balloons.end(); ++iter) {
-    if (origin == (*iter)->notification().origin_url() &&
+    if (profile == (*iter)->profile() &&
+        origin == (*iter)->notification().origin_url() &&
         replace_id == (*iter)->notification().replace_id()) {
       (*iter)->Update(notification);
       return true;
     }
   }
 
   return false;
 }
 
 BalloonCollection::PositionPreference
@@ skipping 23 matching lines @@
   if (NotificationUIManager::DelegatesToMessageCenter()) {
     LOG(ERROR) << "Attempt to run a test that requires "
                << "BalloonNotificationUIManager while delegating to a "
                << "native MessageCenter. Test will fail. Ask dimich@";
     return NULL;
   }
   return static_cast<BalloonNotificationUIManager*>(
       g_browser_process->notification_ui_manager());
 }