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

chrome/browser/notifications/desktop_notification_service.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/desktop_notification_service.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/show_desktop_notification_params.h"
-#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"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/notifications/notifications_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
@@ skipping 12 matching lines @@
 namespace {
 
 const char kChromeNowExtensionID[] = "pafkbggdmjlpgkdkcbjmhmfcdpncadgh";
 
 void CancelNotification(const std::string& id) {
   g_browser_process->notification_ui_manager()->CancelById(id);
 }
 
 }  // namespace
 
-
 // DesktopNotificationService -------------------------------------------------
 
 // static
 void DesktopNotificationService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterListPref(
       prefs::kMessageCenterDisabledExtensionIds,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(
       prefs::kMessageCenterDisabledSystemComponentIds,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
 }
 
 // static
-base::string16 DesktopNotificationService::CreateDataUrl(
-    const GURL& icon_url,
-    const base::string16& title,
-    const base::string16& body,
-    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");
-
-  return CreateDataUrl(resource, subst);
-}
-
-// static
-base::string16 DesktopNotificationService::CreateDataUrl(
-    int resource, const std::vector<std::string>& subst) {
-  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));
-}
-
-// static
 std::string DesktopNotificationService::AddIconNotification(
     const GURL& origin_url,
     const base::string16& title,
     const base::string16& message,
     const gfx::Image& icon,
     const base::string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
   Notification notification(origin_url, icon, title, message,
                             blink::WebTextDirectionDefault,
                             base::string16(), replace_id, delegate);
   g_browser_process->notification_ui_manager()->Add(notification, profile);
   return notification.delegate_id();
 }
 
-DesktopNotificationService::DesktopNotificationService(
-    Profile* profile,
-    NotificationUIManager* ui_manager)
+DesktopNotificationService::DesktopNotificationService(Profile* profile)
     : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
       profile_(profile),
-      ui_manager_(ui_manager),
       extension_registry_observer_(this),
       weak_factory_(this) {
   OnStringListPrefChanged(
       prefs::kMessageCenterDisabledExtensionIds, &disabled_extension_ids_);
   OnStringListPrefChanged(
       prefs::kMessageCenterDisabledSystemComponentIds,
       &disabled_system_component_ids_);
   disabled_extension_id_pref_.Init(
       prefs::kMessageCenterDisabledExtensionIds,
       profile_->GetPrefs(),
@@ skipping 46 matching lines @@
 
   base::string16 display_source = DisplayNameForOriginInProcessId(
       origin, render_frame_host->GetProcess()->GetID());
   Notification notification(origin, params.icon_url, params.title,
       params.body, params.direction, display_source, params.replace_id,
       proxy);
 
   // The webkit notification doesn't timeout.
   notification.set_never_timeout(true);
 
-  GetUIManager()->Add(notification, profile_);
+  g_browser_process->notification_ui_manager()->Add(notification, profile_);
   if (cancel_callback)
     *cancel_callback = base::Bind(&CancelNotification, proxy->id());
 
   DesktopNotificationProfileUtil::UsePermission(profile_, origin);
 }
 
 base::string16 DesktopNotificationService::DisplayNameForOriginInProcessId(
     const GURL& origin, int process_id) {
 #if defined(ENABLE_EXTENSIONS)
   // If the source is an extension, lookup the display name.
@@ skipping 13 matching lines @@
         if (IsNotifierEnabled(notifier_id))
           return base::UTF8ToUTF16((*iter)->name());
       }
     }
   }
 #endif
 
   return base::UTF8ToUTF16(origin.host());
 }
 
-NotificationUIManager* DesktopNotificationService::GetUIManager() {
-  // We defer setting ui_manager_ to the global singleton until we need it
-  // in order to avoid UI dependent construction during startup.
-  if (!ui_manager_)
-    ui_manager_ = g_browser_process->notification_ui_manager();
-  return ui_manager_;
-}
-
 bool DesktopNotificationService::IsNotifierEnabled(
     const NotifierId& notifier_id) {
   switch (notifier_id.type) {
     case NotifierId::APPLICATION:
       return disabled_extension_ids_.find(notifier_id.id) ==
           disabled_extension_ids_.end();
     case NotifierId::WEB_PAGE:
       return DesktopNotificationProfileUtil::GetContentSetting(
           profile_, notifier_id.url) == CONTENT_SETTING_ALLOW;
     case NotifierId::SYSTEM_COMPONENT:
@@ skipping 124 matching lines @@
   // Tell the IO thread that this extension's permission for notifications
   // has changed.
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&extensions::InfoMap::SetNotificationsDisabled,
                  extension_info_map, notifier_id.id, !enabled));
 #endif
 }