Move the logic for creating data: URLs out of DesktopNotificationService.

chrome/browser/notifications/notification.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/notification.h"
 
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"

[Jun Mukai, 2014/09/10 18:18:59]

You can remove this include right?

[Peter Beverloo, 2014/09/11 16:02:26]

Done.

+#include "grit/browser_resources.h"
+#include "net/base/escape.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 
+namespace {
+
+// Creates a data:xxxx URL which contains the full HTML for a notification
+// using supplied icon, title, and text, run through a template which contains
+// the standard formatting for notifications.
+base::string16 CreateDataUrlForNotificationData(const GURL& icon_url,
+                                                const base::string16& title,
+                                                const base::string16& body,
+                                                blink::WebTextDirection dir) {
+  int resource;
+  std::vector<std::string> subst;
+  if (icon_url.is_valid()) {
+    resource = IDR_NOTIFICATION_ICON_HTML;
+    subst.push_back(icon_url.spec());
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(title)));
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(body)));
+    // icon float position
+    subst.push_back(dir == blink::WebTextDirectionRightToLeft ?
+                    "right" : "left");
+  } else if (title.empty() || body.empty()) {
+    resource = IDR_NOTIFICATION_1LINE_HTML;
+    base::string16 line = title.empty() ? body : title;
+    // Strings are div names in the template file.
+    base::string16 line_name =
+        title.empty() ? base::ASCIIToUTF16("description")
+                      : base::ASCIIToUTF16("title");
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(line_name)));
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(line)));
+  } else {
+    resource = IDR_NOTIFICATION_2LINE_HTML;
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(title)));
+    subst.push_back(net::EscapeForHTML(base::UTF16ToUTF8(body)));
+  }
+  // body text direction
+  subst.push_back(dir == blink::WebTextDirectionRightToLeft ?
+                  "rtl" : "ltr");
+
+  const base::StringPiece template_html(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(
+          resource));
+
+  if (template_html.empty()) {
+    NOTREACHED() << "unable to load template. ID: " << resource;
+    return base::string16();
+  }
+
+  std::string data = ReplaceStringPlaceholders(template_html, subst, NULL);
+  return base::UTF8ToUTF16("data:text/html;charset=utf-8," +
+                               net::EscapeQueryParamValue(data, false));
+}
+
+}  // namespace
+
 Notification::Notification(const GURL& origin_url,
                            const GURL& icon_url,
                            const base::string16& title,
                            const base::string16& body,
                            blink::WebTextDirection dir,
                            const base::string16& display_source,
                            const base::string16& replace_id,
                            NotificationDelegate* delegate)
     : message_center::Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
                                    delegate->id(),
                                    title,
                                    body,
                                    gfx::Image(),
                                    display_source,
                                    message_center::NotifierId(origin_url),
                                    message_center::RichNotificationData(),
                                    delegate),
       origin_url_(origin_url),
       icon_url_(icon_url),
       replace_id_(replace_id),
       delegate_(delegate) {
   // "Upconvert" the string parameters to a data: URL.
-  content_url_ = GURL(DesktopNotificationService::CreateDataUrl(
+  content_url_ = GURL(CreateDataUrlForNotificationData(
       icon_url, title, body, dir));
 }
 
 Notification::Notification(
     message_center::NotificationType type,
     const GURL& origin_url,
     const base::string16& title,
     const base::string16& body,
     const gfx::Image& icon,
     blink::WebTextDirection dir,
@@ skipping 57 matching lines @@
   origin_url_ = notification.origin_url();
   icon_url_ = notification.icon_url();
   content_url_ = notification.content_url();
   button_one_icon_url_ = notification.button_one_icon_url();
   button_two_icon_url_ = notification.button_two_icon_url();
   image_url_ = notification.image_url();
   replace_id_ = notification.replace_id();
   delegate_ = notification.delegate();
   return *this;
 }