Integrate the notification database with the normal code path.

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/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "extensions/browser/extension_registry.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"
 #include "extensions/common/permissions/permissions_data.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "base/strings/string_number_conversions.h"
+#endif
+
 using content::BrowserThread;
 using message_center::NotifierId;
 
 namespace {
 
 void CancelNotification(const std::string& id, ProfileID profile_id) {
   PlatformNotificationServiceImpl::GetInstance()
       ->GetNotificationUIManager()->CancelById(id, profile_id);
 }
 
 }  // namespace
 
 // static
 PlatformNotificationServiceImpl*
 PlatformNotificationServiceImpl::GetInstance() {
   return Singleton<PlatformNotificationServiceImpl>::get();
 }
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
     : notification_ui_manager_for_tests_(nullptr) {}
 
 PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
 
-void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
-    content::BrowserContext* browser_context,
-    int64 service_worker_registration_id,
-    const std::string& notification_id,
-    const GURL& origin,
-    const content::PlatformNotificationData& notification_data,
-    const base::Callback<void(content::PersistentNotificationStatus)>&
-        callback) const {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  content::NotificationEventDispatcher::GetInstance()
-      ->DispatchNotificationClickEvent(
-            browser_context,
-            origin,
-            service_worker_registration_id,
-            notification_id,
-            notification_data,
-            callback);
-}
-
 blink::WebNotificationPermission
 PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
     content::BrowserContext* browser_context,
     const GURL& origin,
     int render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
@@ skipping 120 matching lines @@
         base::Bind(&CancelNotification,
                    notification.delegate_id(),
                    NotificationUIManager::GetProfileID(profile));
 
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     content::BrowserContext* browser_context,
-    int64 service_worker_registration_id,
+    int64_t persistent_notification_id,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   PersistentNotificationDelegate* delegate = new PersistentNotificationDelegate(
-      browser_context,
-      service_worker_registration_id,
-      origin,
-      notification_data);
+      browser_context, persistent_notification_id, origin);
 
   Notification notification = CreateNotificationFromData(
       profile, origin, icon, notification_data, delegate);
 
+  // TODO(peter): Remove this mapping when we have reliable id generation for
+  // the message_center::Notification objects.
+  persistent_notifications_[persistent_notification_id] = notification.id();
+
   GetNotificationUIManager()->Add(notification, profile);
 
   profile->GetHostContentSettingsMap()->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
     content::BrowserContext* browser_context,
-    const std::string& persistent_notification_id) {
+    int64_t persistent_notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
+#if defined(OS_ANDROID)
+  // TODO(peter): Remove this conversion when the notification ids are being
+  // generated by the caller of this method.
+  std::string textual_persistent_notification_id =
+      base::Int64ToString(persistent_notification_id);
   GetNotificationUIManager()->CancelById(

[johnme, 2015/04/08 17:33:32]

Eww eww eww. CancelById takes a delegate_id (random GUID) as a parameter, but
you're passing a stringified persistent notification id (database int64).

It seems it'd be cleaner to add a separate
CancelPersistentNotificationById(int64_t p_n_i) method instead? (and preferably
use it on all platforms, not just Android?)

[Peter Beverloo, 2015/04/08 18:57:48]

This is a strictly temporary measure which will go away when //content/
generates the delegate Ids. Introducing another method on the
NotificationUIManager interface doesn't seem worth it if this will go away Real
Soon now.

[johnme, 2015/04/09 10:06:11]

Fine. Added a task to the spreadsheet.

-      persistent_notification_id, NotificationUIManager::GetProfileID(profile));
+      textual_persistent_notification_id,
+      NotificationUIManager::GetProfileID(profile));
+#else
+  auto iter = persistent_notifications_.find(persistent_notification_id);
+  if (iter == persistent_notifications_.end())
+    return;
+
+  GetNotificationUIManager()->CancelById(
+      iter->second, NotificationUIManager::GetProfileID(profile));
+
+  persistent_notifications_.erase(iter);
+#endif  // defined(OS_ANDROID)
 }
 
 Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
     Profile* profile,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
     NotificationDelegate* delegate) const {
   base::string16 display_source = DisplayNameForOrigin(profile, origin);
 
@@ skipping 67 matching lines @@
       formatted_origin.push_back(':');
       formatted_origin.append(base::UTF8ToUTF16(origin.port()));
     }
     return formatted_origin;
   }
 
   // TODO(dewittj): Once file:// URLs are passed in to the origin
   // GURL here, begin returning the path as the display name.
   return net::FormatUrl(origin, languages);
 }