Revert of Minimize the delegate dependencies for non persistent notifications.

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/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
-#include "chrome/browser/notifications/native_notification_delegate.h"
-#include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/chrome_features.h"
-#include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/common/notification_resources.h"
@@ skipping 73 matching lines @@
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
     : test_display_service_(nullptr) {
 #if BUILDFLAG(ENABLE_BACKGROUND)
   pending_click_dispatch_events_ = 0;
 #endif
 }
 
 PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
 
-// TODO(miguelg): Move this to PersistentNotificationHandler
 void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
     BrowserContext* browser_context,
     const std::string& notification_id,
     const GURL& origin,
     int action_index,
     const base::NullableString16& reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   blink::mojom::PermissionStatus permission_status =
       CheckPermissionOnUIThread(browser_context, origin,
                                 kInvalidRenderProcessId);
@@ skipping 25 matching lines @@
 
   RecordSiteEngagement(browser_context, origin);
   content::NotificationEventDispatcher::GetInstance()
       ->DispatchNotificationClickEvent(
           browser_context, notification_id, origin, action_index, reply,
           base::Bind(
               &PlatformNotificationServiceImpl::OnClickEventDispatchComplete,
               base::Unretained(this)));
 }
 
-// TODO(miguelg): Move this to PersistentNotificationHandler
 void PlatformNotificationServiceImpl::OnPersistentNotificationClose(
     BrowserContext* browser_context,
     const std::string& notification_id,
     const GURL& origin,
     bool by_user) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If we programatically closed this notification, don't dispatch any event.
   if (closed_notifications_.erase(notification_id) != 0)
     return;
@@ skipping 126 matching lines @@
   // crash (see |ScopedKeepAlive|). We just do nothing here, the user would not
   // see the notification anyway, since we are shutting down.
   if (g_browser_process->IsShuttingDown())
     return;
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
   DCHECK_EQ(0u, notification_data.actions.size());
   DCHECK_EQ(0u, notification_resources.action_icons.size());
 
-  // Temporary change while the delegates are merged.
-  NotificationDelegate* notification_delegate;
-#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-  if (base::FeatureList::IsEnabled(features::kNativeNotifications) &&
-      g_browser_process->notification_platform_bridge()) {
-    notification_delegate = new NativeNotificationDelegate(notification_id);
-  } else {
-    notification_delegate = new NotificationObjectProxy(
-        browser_context, notification_id, origin, std::move(delegate));
-  }
-#else
-  notification_delegate = new NotificationObjectProxy(
+  NotificationObjectProxy* proxy = new NotificationObjectProxy(
       browser_context, notification_id, origin, std::move(delegate));
-#endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
-
   Notification notification = CreateNotificationFromData(
       profile, GURL() /* service_worker_scope */, origin, notification_data,
-      notification_resources, notification_delegate);
+      notification_resources, proxy);
 
   GetNotificationDisplayService(profile)->Display(
-      NotificationCommon::NON_PERSISTENT, notification_id, notification);
+      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_id,
-                                  profile_id, profile->IsOffTheRecord());
+    *cancel_callback =
+        base::Bind(&CancelNotification, notification.delegate_id(), profile_id,
+                   profile->IsOffTheRecord());
   }
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     BrowserContext* browser_context,
     const std::string& notification_id,
     const GURL& service_worker_scope,
     const GURL& origin,
     const content::PlatformNotificationData& notification_data,
     const content::NotificationResources& notification_resources) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Posted tasks can request notifications to be added, which would cause a
   // crash (see |ScopedKeepAlive|). We just do nothing here, the user would not
   // see the notification anyway, since we are shutting down.
   if (g_browser_process->IsShuttingDown())
     return;
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
   // The notification settings button will be appended after the developer-
   // supplied buttons, available in |notification_data.actions|.
   int settings_button_index = notification_data.actions.size();
-
   PersistentNotificationDelegate* delegate = new PersistentNotificationDelegate(
       browser_context, notification_id, origin, settings_button_index);
 
   Notification notification = CreateNotificationFromData(
       profile, service_worker_scope, origin, notification_data,
       notification_resources, delegate);
 
   GetNotificationDisplayService(profile)->Display(
       NotificationCommon::PERSISTENT, notification_id, notification);
   base::RecordAction(base::UserMetricsAction("Notifications.Persistent.Shown"));
@@ skipping 168 matching lines @@
 
 void PlatformNotificationServiceImpl::RecordSiteEngagement(
     BrowserContext* browser_context,
     const GURL& origin) {
   // TODO(dominickn, peter): This would be better if the site engagement service
   // could directly observe each notification.
   SiteEngagementService* engagement_service =
       SiteEngagementService::Get(Profile::FromBrowserContext(browser_context));
   engagement_service->HandleNotificationInteraction(origin);
 }