Implement native web notifications for mac

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 "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_number_conversions.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/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
@@ skipping 24 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.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::BrowserContext;
 using content::BrowserThread;
 using content::PlatformNotificationContext;
 using message_center::NotifierId;
 
 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;
@@ skipping 21 matching lines @@
 
 }  // namespace
 
 // static
 PlatformNotificationServiceImpl*
 PlatformNotificationServiceImpl::GetInstance() {
   return base::Singleton<PlatformNotificationServiceImpl>::get();
 }
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
-    : notification_ui_manager_for_tests_(nullptr) {}
+    : native_notification_ui_manager_(
+          NotificationUIManager::CreateNativeNotificationManager()),
+      notification_ui_manager_for_tests_(nullptr) {}
 
 PlatformNotificationServiceImpl::~PlatformNotificationServiceImpl() {}
 
 void PlatformNotificationServiceImpl::OnPersistentNotificationClick(
     BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
     int action_index) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   blink::WebNotificationPermission permission =
@@ skipping 214 matching lines @@
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
     BrowserContext* browser_context,
     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(
-      textual_persistent_notification_id,
-      NotificationUIManager::GetProfileID(profile));
+  bool cancel_by_persistent_id = true;
 #else
+  bool cancel_by_persistent_id = (native_notification_ui_manager_ != nullptr);
+#endif
+
+  if (cancel_by_persistent_id) {
+    // TODO(peter): Remove this conversion when the notification ids are being
+    // generated by the caller of this method.
+    GetNotificationUIManager()->CancelById(
+        base::Int64ToString(persistent_notification_id),
+        NotificationUIManager::GetProfileID(profile));
+  }
+
   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
 }
 
 bool PlatformNotificationServiceImpl::GetDisplayedPersistentNotifications(
     BrowserContext* browser_context,
     std::set<std::string>* displayed_notifications) {
   DCHECK(displayed_notifications);
 
 #if !defined(OS_ANDROID)
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile || profile->AsTestingProfile())
@@ skipping 55 matching lines @@
     notification.set_never_timeout(true);
 
   return notification;
 }
 
 NotificationUIManager*
 PlatformNotificationServiceImpl::GetNotificationUIManager() const {
   if (notification_ui_manager_for_tests_)
     return notification_ui_manager_for_tests_;
 
+  if (native_notification_ui_manager_) {
+    return native_notification_ui_manager_.get();
+  }
+
   return g_browser_process->notification_ui_manager();
 }
 
 void PlatformNotificationServiceImpl::OpenNotificationSettings(
     BrowserContext* browser_context) {
 #if defined(OS_ANDROID)
   NOTIMPLEMENTED();
 #else
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
@@ skipping 27 matching lines @@
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
     return base::UTF8ToUTF16(extension->name());
   }
 #endif
 
   return base::string16();
 }