Add initial support for native Linux desktop notifications

chrome/browser/notifications/message_center_notification_manager.cc

 // Copyright (c) 2012 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/message_center_notification_manager.h"
 
 #include <memory>
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/notifications/extension_welcome_notification.h"
 #include "chrome/browser/notifications/extension_welcome_notification_factory.h"
 #include "chrome/browser/notifications/fullscreen_notification_blocker.h"
 #include "chrome/browser/notifications/message_center_settings_controller.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/profile_notification.h"
 #include "chrome/browser/notifications/screen_lock_notification_blocker.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/shell.h"
 #endif
 
+#if defined(USE_GLIB) && defined(USE_GIO)
+#include "chrome/browser/notifications/dbus_notification_manager.h"
+#endif
+
 using message_center::NotifierId;
 
 MessageCenterNotificationManager::MessageCenterNotificationManager(
     message_center::MessageCenter* message_center,
     std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider)
     : message_center_(message_center),
       settings_provider_(std::move(settings_provider)),
       system_observer_(this),
       stats_collector_(message_center) {
   message_center_->AddObserver(this);
   message_center_->SetNotifierSettingsProvider(settings_provider_.get());
 
 #if defined(OS_CHROMEOS)
   blockers_.push_back(
       base::MakeUnique<LoginStateNotificationBlockerChromeOS>(message_center));
 #else
   blockers_.push_back(
       base::MakeUnique<ScreenLockNotificationBlocker>(message_center));
 #endif
   blockers_.push_back(
       base::MakeUnique<FullscreenNotificationBlocker>(message_center));
 
 #if defined(OS_WIN) || defined(OS_MACOSX) \
   || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(USE_GLIB) && defined(USE_GIO)
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseSystemNotifications)) {
+    dbus_notification_manager_.reset(
+        DbusNotificationManager::CreateDbusNotificationManager(message_center));

[Peter Beverloo, 2017/04/03 23:39:29]

Instead of putting this in MessageCenterNotificationManager, which contains
logic that won't be relevant anymore, you should create a
NotificationPlatformBridgeLinux and make sure that we create a
NativeNotificationDisplayService instance with it in the
NotificationDisplayServiceFactory. This pattern already exists for our usage of
Mac native notifications.

[Tom (Use chromium acct), 2017/04/04 02:43:17]

Done.

+  }
+  if (dbus_notification_manager_)
+    return;  // Do not create a message center tray if using the dbus impl.
+#endif
   // On Windows, Linux and Mac, the notification manager owns the tray icon and
-  // views.Other platforms have global ownership and Create will return NULL.
+  // views.  Other platforms have global ownership and Create will return NULL.
   tray_.reset(message_center::CreateMessageCenterTray());
 #endif
 }
 
 MessageCenterNotificationManager::~MessageCenterNotificationManager() {
   message_center_->SetNotifierSettingsProvider(nullptr);
   message_center_->RemoveObserver(this);
 
   profile_notifications_.clear();
 }
@@ skipping 258 matching lines @@
 }
 
 ProfileNotification* MessageCenterNotificationManager::FindProfileNotification(
     const std::string& id) const {
   auto iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return nullptr;
 
   return (*iter).second.get();
 }