Add a separate Notification constructor to differentiate between text and HTML notifications.

BUG=120677
TEST=Covered by tests.


Review URL: http://codereview.chromium.org/9981009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131188 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 10 deletions

diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index 92c0ee7..cf22a9a 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -388,19 +388,16 @@ bool DesktopNotificationService::ShowDesktopNotification(
       new NotificationObjectProxy(process_id, route_id,
                                   params.notification_id,
                                   source == WorkerNotification);
-  GURL contents;
+
+  string16 display_source = DisplayNameForOrigin(origin);
   if (params.is_html) {
-    contents = params.contents_url;
+    ShowNotification(Notification(origin, params.contents_url, display_source,
+        params.replace_id, proxy));
   } else {
-    // "upconvert" the string parameters to a data: URL.
-    contents = GURL(
-        CreateDataUrl(params.icon_url, params.title, params.body,
-                      params.direction));
+    ShowNotification(Notification(origin, params.icon_url, params.title,
+        params.body, params.direction, display_source, params.replace_id,
+        proxy));
   }
-  Notification notification(
-      origin, contents, DisplayNameForOrigin(origin),
-      params.replace_id, proxy);
-  ShowNotification(notification);
   return true;
 }