[WebAPKs] Plumb service worker scope to 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/command_line.h"
@@ skipping 271 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   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);
+      profile, GURL() /* service_worker_scope */, origin, notification_data,
+      notification_resources, proxy);
 
   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());
   }
 
   HostContentSettingsMapFactory::GetForProfile(profile)->UpdateLastUsage(
       origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void PlatformNotificationServiceImpl::DisplayPersistentNotification(
     BrowserContext* browser_context,
     int64_t persistent_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);
 
   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, persistent_notification_id, origin,
       settings_button_index);
 
   Notification notification = CreateNotificationFromData(
-      profile, origin, notification_data, notification_resources, delegate);
+      profile, service_worker_scope, 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(
@@ skipping 68 matching lines @@
 void PlatformNotificationServiceImpl::OnCloseEventDispatchComplete(
     content::PersistentNotificationStatus status) {
   UMA_HISTOGRAM_ENUMERATION(
       "Notifications.PersistentWebNotificationCloseResult", status,
       content::PersistentNotificationStatus::
           PERSISTENT_NOTIFICATION_STATUS_MAX);
 }
 
 Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
     Profile* profile,
+    const GURL& service_worker_scope,
     const GURL& origin,
     const content::PlatformNotificationData& notification_data,
     const content::NotificationResources& notification_resources,
     NotificationDelegate* delegate) const {
   DCHECK_EQ(notification_data.actions.size(),
             notification_resources.action_icons.size());
 
   // TODO(peter): Handle different screen densities instead of always using the
   // 1x bitmap - crbug.com/585815.
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE, notification_data.title,
       notification_data.body,
       gfx::Image::CreateFrom1xBitmap(notification_resources.notification_icon),
       message_center::NotifierId(origin), base::UTF8ToUTF16(origin.host()),
       origin, notification_data.tag, message_center::RichNotificationData(),
       delegate);
 
+  notification.set_service_worker_scope(service_worker_scope);
   notification.set_context_message(
       DisplayNameForContextMessage(profile, origin));
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_timestamp(notification_data.timestamp);
   notification.set_renotify(notification_data.renotify);
   notification.set_silent(notification_data.silent);
 
   // Badges are only supported on Android, primarily because it's the only
   // platform that makes good use of them in the status bar.
   // TODO(mvanouwerkerk): ensure no badge is loaded when it will not be used.
@@ skipping 48 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }