Move handler processing to NotificationDisplayService

chrome/browser/notifications/notification_platform_bridge_linux.cc

 // Copyright 2017 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/notification_platform_bridge_linux.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/files/file_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/notifications/native_notification_display_service.h"
 #include "chrome/browser/notifications/notification.h"
+#include "chrome/browser/notifications/notification_display_service.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration_linux.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
@@ skipping 119 matching lines @@
 void ProfileLoadedCallback(NotificationCommon::Operation operation,
                            NotificationCommon::Type notification_type,
                            const std::string& origin,
                            const std::string& notification_id,
                            int action_index,
                            const base::NullableString16& reply,
                            Profile* profile) {
   if (!profile)
     return;
 
-  auto* display_service = static_cast<NativeNotificationDisplayService*>(
-      NotificationDisplayServiceFactory::GetForProfile(profile));
+  auto* display_service =
+      NotificationDisplayServiceFactory::GetForProfile(profile);
   display_service->ProcessNotificationOperation(operation, notification_type,
                                                 origin, notification_id,
                                                 action_index, reply);
 }
 
 void ForwardNotificationOperationOnUiThread(
     NotificationCommon::Operation operation,
     NotificationCommon::Type notification_type,
     const std::string& origin,
     const std::string& notification_id,
@@ skipping 153 matching lines @@
     uint32_t dbus_id = 0;
 
     // Same parameters used by NotificationPlatformBridge::Display().
     NotificationCommon::Type notification_type;
     const std::string notification_id;
     const std::string profile_id;
     const bool is_incognito;
 
     // A copy of the origin_url from the underlying
     // message_center::Notification.  Used to pass back to
-    // NativeNotificationDisplayService.
+    // NotificationDisplayService.
     const GURL origin_url;
 
     // Used to keep track of the IDs of the buttons currently displayed
     // on this notification.  The valid range of action IDs is
     // [action_start, action_end).
     size_t action_start = 0;
     size_t action_end = 0;
 
     // Temporary resource files associated with the notification that
     // should be cleaned up when the notification is closed or on
@@ skipping 548 matching lines @@
 }
 
 void NotificationPlatformBridgeLinux::SetReadyCallback(
     NotificationBridgeReadyCallback callback) {
   impl_->SetReadyCallback(std::move(callback));
 }
 
 void NotificationPlatformBridgeLinux::CleanUp() {
   impl_->CleanUp();
 }