Linux native notifications: Add desktop-entry hint

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 "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.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_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/shell_integration_linux.h"
 #include "content/public/browser/notification_service.h"
 
 namespace {
 
 const char kFreedesktopNotificationsName[] = "org.freedesktop.Notifications";
 const char kFreedesktopNotificationsPath[] = "/org/freedesktop/Notifications";
 
 void AddActionToNotification(GVariantBuilder* actions_builder,
                              const char* action_id,
                              const char* button_label) {
@@ skipping 336 matching lines @@
   if (notification.clickable()) {
     // Special case: the pair ("default", "") will not add a button,
     // but instead makes the entire notification clickable.
     AddActionToNotification(&actions_builder, "default", "");
   }
   // Always add a settings button.
   AddActionToNotification(&actions_builder, "settings", "Settings");
 
   GVariantBuilder hints_builder;
   g_variant_builder_init(&hints_builder, G_VARIANT_TYPE("a{sv}"));
+
   g_variant_builder_add(&hints_builder, "{sv}", "urgency",
                         g_variant_new_byte(NotificationPriorityToFdoUrgency(
                             notification.priority())));
 
+  std::unique_ptr<base::Environment> env = base::Environment::Create();
+  std::string desktop_file = shell_integration_linux::GetDesktopName(env.get());
+  const char kDesktopFileSuffix[] = ".desktop";
+  DCHECK(base::EndsWith(desktop_file, kDesktopFileSuffix,
+                        base::CompareCase::SENSITIVE));
+  desktop_file =
+      desktop_file.substr(0, desktop_file.size() - strlen(kDesktopFileSuffix));

[Lei Zhang, 2017/04/14 01:23:10]

Alternatively, maybe make |desktop_file| a base::FilePath, and then you can use
RemoveFinalExtension()?

[Tom (Use chromium acct), 2017/04/18 03:46:40]

Done.

+  g_variant_builder_add(&hints_builder, "{sv}", "desktop-entry",
+                        g_variant_new_string(desktop_file.c_str()));
+
   if (!resource_files->icon_file.empty()) {
     g_variant_builder_add(
         &hints_builder, "{sv}", "image-path",
         g_variant_new_string(resource_files->icon_file.value().c_str()));
     data->resource_files.push_back(resource_files->icon_file);
     resource_files->icon_file.clear();
   }
 
   const std::string title = base::UTF16ToUTF8(notification.title());
   const std::string message = base::UTF16ToUTF8(notification.message());
 
-  GVariant* parameters =
-      g_variant_new("(susssasa{sv}i)", "", data->dbus_id, "", title.c_str(),
-                    message.c_str(), &actions_builder, &hints_builder, -1);
+  GVariant* parameters = g_variant_new(
+      "(susssasa{sv}i)", "" /* app_name passed implicitly via desktop-entry */,
+      data->dbus_id, "" /* app_icon passed implicitly via desktop-entry */,
+      title.c_str(), message.c_str(), &actions_builder, &hints_builder, -1);
   g_dbus_proxy_call(notification_proxy_, "Notify", parameters,
                     G_DBUS_CALL_FLAGS_NONE, -1, data->cancellable, callback,
                     user_data);
 }
 
 void NotificationPlatformBridgeLinux::CloseNow(uint32_t dbus_id) {
   g_dbus_proxy_call(notification_proxy_, "CloseNotification",
                     g_variant_new("(u)", dbus_id), G_DBUS_CALL_FLAGS_NONE, -1,
                     nullptr, nullptr, nullptr);
 }
@@ skipping 77 matching lines @@
       if (!data)
         return;
       size_t n_buttons = data->action_end - data->action_start;
       if (id >= n_buttons)
         return;
       ForwardNotificationOperation(dbus_id, NotificationCommon::CLICK,
                                    id - data->action_start);
     }
   }
 }