Remove ShowDesktopNotificationHostMsgParams in favor of PlatformNotificationData.

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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/platform_notification_service_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
-#include "content/public/common/show_desktop_notification_params.h"
+#include "content/public/common/platform_notification_data.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
@@ skipping 60 matching lines @@
   if (setting == CONTENT_SETTING_ALLOW)
     return blink::WebNotificationPermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return blink::WebNotificationPermissionDenied;
 
   return blink::WebNotificationPermissionDefault;
 }
 
 void PlatformNotificationServiceImpl::DisplayNotification(
     content::BrowserContext* browser_context,
-    const content::ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const content::PlatformNotificationData& notification_data,
     scoped_ptr<content::DesktopNotificationDelegate> delegate,
     int render_process_id,
     base::Closure* cancel_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   NotificationObjectProxy* proxy = new NotificationObjectProxy(delegate.Pass());
   base::string16 display_source = DisplayNameForOriginInProcessId(
-      profile, params.origin, render_process_id);
+      profile, origin, render_process_id);
 
   // TODO(peter): Icons for Web Notifications are currently always requested for
   // 1x scale, whereas the displays on which they can be displayed can have a
   // different pixel density. Be smarter about this when the API gets updated
   // with a way for developers to specify images of different resolutions.
-  Notification notification(params.origin, params.title, params.body,
-      gfx::Image::CreateFrom1xBitmap(params.icon),
-      display_source, params.replace_id, proxy);
+  Notification notification(origin, notification_data.title,
+      notification_data.body, gfx::Image::CreateFrom1xBitmap(icon),
+      display_source, notification_data.tag, proxy);
 
   // Web Notifications do not timeout.
   notification.set_never_timeout(true);
 
   GetNotificationUIManager()->Add(notification, profile);
   if (cancel_callback)
     *cancel_callback =
         base::Bind(&CancelNotification,
                    proxy->id(),
                    NotificationUIManager::GetProfileID(profile));
 
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
-      params.origin, params.origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+      origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     content::BrowserContext* browser_context,
     int64 service_worker_registration_id,
-    const content::ShowDesktopNotificationHostMsgParams& params,
+    const GURL& origin,
+    const SkBitmap& icon,
+    const content::PlatformNotificationData& notification_data,
     int render_process_id) {
   NOTIMPLEMENTED();
 }
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
     content::BrowserContext* browser_context,
     const std::string& persistent_notification_id) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 32 matching lines @@
         NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
         if (desktop_notification_service->IsNotifierEnabled(notifier_id))
           return base::UTF8ToUTF16(extension->name());
       }
     }
   }
 #endif
 
   return base::UTF8ToUTF16(origin.host());
 }