Introduce a new API to handle native notification clicks

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 <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 63 matching lines @@
 namespace {
 
 // Invalid id for a renderer process. Used in cases where we need to check for
 // permission without having an associated renderer process yet.
 const int kInvalidRenderProcessId = -1;
 
 void OnCloseNonPersistentNotificationProfileLoaded(
     const std::string& notification_id,
     Profile* profile) {
   NotificationDisplayServiceFactory::GetForProfile(profile)->Close(
-      notification_id);
-}
-
-// Callback to run once the profile has been loaded in order to perform a
-// given |operation| in a notification.
-void ProfileLoadedCallback(NotificationCommon::Operation operation,
-                           const GURL& origin,
-                           int64_t persistent_notification_id,
-                           int action_index,
-                           Profile* profile) {
-  if (!profile) {
-    // TODO(miguelg): Add UMA for this condition.
-    // Perhaps propagate this through PersistentNotificationStatus.
-    LOG(WARNING) << "Profile not loaded correctly";
-    return;
-  }
-
-  switch (operation) {
-    case NotificationCommon::CLICK:
-      PlatformNotificationServiceImpl::GetInstance()
-          ->OnPersistentNotificationClick(profile, persistent_notification_id,
-                                          origin, action_index);
-      break;
-    case NotificationCommon::CLOSE:
-      PlatformNotificationServiceImpl::GetInstance()
-          ->OnPersistentNotificationClose(profile, persistent_notification_id,
-                                          origin, true);
-      break;
-    case NotificationCommon::SETTINGS:
-      NotificationCommon::OpenNotificationSettings(profile);
-      break;
-  }
+      NotificationCommon::NON_PERSISTENT, notification_id);
 }
 
 // Callback used to close an non-persistent notification from blink.
 void CancelNotification(const std::string& notification_id,
                         std::string profile_id,
                         bool incognito) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
   profile_manager->LoadProfile(
       profile_id, incognito,
@@ skipping 11 matching lines @@
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
     : test_display_service_(nullptr) {
 #if BUILDFLAG(ENABLE_BACKGROUND)
   pending_click_dispatch_events_ = 0;
 #endif
 }
 
 PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
 
-void PlatformNotificationServiceImpl::ProcessPersistentNotificationOperation(
-    NotificationCommon::Operation operation,
-    const std::string& profile_id,
-    bool incognito,
-    const GURL& origin,
-    int64_t persistent_notification_id,
-    int action_index) {
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-  DCHECK(profile_manager);
-
-  profile_manager->LoadProfile(
-      profile_id, incognito,
-      base::Bind(&ProfileLoadedCallback, operation, origin,
-                 persistent_notification_id, action_index));
-}
-
 void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
     BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
     int action_index) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   blink::mojom::PermissionStatus permission_status =
       CheckPermissionOnUIThread(browser_context, origin,
                                 kInvalidRenderProcessId);
 
@@ skipping 157 matching lines @@
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
   DCHECK_EQ(0u, notification_data.actions.size());
   DCHECK_EQ(0u, notification_resources.action_icons.size());
 
   NotificationObjectProxy* proxy =
       new NotificationObjectProxy(browser_context, std::move(delegate));
   Notification notification = CreateNotificationFromData(
       profile, origin, notification_data, notification_resources, proxy);
-  GetNotificationDisplayService(profile)->Display(notification.delegate_id(),
-                                                  notification);
+
+  GetNotificationDisplayService(profile)->Display(
+      NotificationCommon::NON_PERSISTENT, notification.delegate_id(),
+      notification);
   if (cancel_callback) {
 #if defined(OS_WIN)
     std::string profile_id =
         base::WideToUTF8(profile->GetPath().BaseName().value());
 #elif defined(OS_POSIX)
     std::string profile_id = profile->GetPath().BaseName().value();
 #endif
     *cancel_callback =
         base::Bind(&CancelNotification, notification.delegate_id(), profile_id,
                    profile->IsOffTheRecord());
@@ skipping 22 matching lines @@
       settings_button_index);
 
   Notification notification = CreateNotificationFromData(
       profile, origin, notification_data, notification_resources, 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();
 
   GetNotificationDisplayService(profile)->Display(
+      NotificationCommon::PERSISTENT,
       base::Int64ToString(delegate->persistent_notification_id()),
       notification);
   content::RecordAction(
       base::UserMetricsAction("Notifications.Persistent.Shown"));
 
   HostContentSettingsMapFactory::GetForProfile(profile)->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
@@ skipping 10 matching lines @@
   bool cancel_by_persistent_id = true;
 #else
   bool cancel_by_persistent_id =
       GetNotificationDisplayService(profile)->SupportsNotificationCenter();
 #endif
 
   if (cancel_by_persistent_id) {
     // TODO(peter): Remove this conversion when the notification ids are being
     // generated by the caller of this method.
     GetNotificationDisplayService(profile)->Close(
+        NotificationCommon::PERSISTENT,
         base::Int64ToString(persistent_notification_id));
   } else {
     auto iter = persistent_notifications_.find(persistent_notification_id);
     if (iter == persistent_notifications_.end())
       return;
-    GetNotificationDisplayService(profile)->Close(iter->second);
+    GetNotificationDisplayService(profile)->Close(
+        NotificationCommon::PERSISTENT, iter->second);
   }
 
   persistent_notifications_.erase(persistent_notification_id);
 }
 
 bool PlatformNotificationServiceImpl::GetDisplayedPersistentNotifications(
     BrowserContext* browser_context,
     std::set<std::string>* displayed_notifications) {
   DCHECK(displayed_notifications);
 
@@ skipping 108 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }