Plumb through notification action types and placeholders on Android

chrome/browser/notifications/notification_platform_bridge_android.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/notification_platform_bridge_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/native_notification_display_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 195 matching lines @@
 
   std::vector<base::string16> action_titles_vector;
   for (const message_center::ButtonInfo& button : notification.buttons())
     action_titles_vector.push_back(button.title);
   ScopedJavaLocalRef<jobjectArray> action_titles =
       base::android::ToJavaArrayOfStrings(env, action_titles_vector);
 
   ScopedJavaLocalRef<jobjectArray> action_icons =
       ConvertToJavaBitmaps(notification.buttons());
 
+  std::vector<base::string16> action_types_vector;
+  for (const message_center::ButtonInfo& button : notification.buttons()) {
+    if (button.type == message_center::NotificationActionType::TEXT) {
+      action_types_vector.push_back(base::ASCIIToUTF16("text"));

[awdf, 2016/09/13 14:14:55]

I'm aware I probably want a vector of booleans or an enum type here instead of
strings, but this was the quickest way I could get it working!
(ToJavaArrayOfBooleans didn't seem to exist).

[Peter Beverloo, 2016/09/14 16:27:12]

I think you're looking at too small of a problem— the fact that we have all
these action_* arrays which are expected (and assumed) to be of the right size
is an issue already.

What would be fantastic is if we could take a step back, and instead be able to
instantiate some Action object from C++, so that displayNotification in Java
gets an Action[].

Would you be interested in taking a look at that? Certainly doesn't have to be
this CL.

[awdf, 2016/09/22 14:17:11]

Sure, it would definitely be nice to cut down the giant list of parameters in
NPB.displayNotification :)

Have added a TODO in NotificationPlatformBridge and will do this in a future CL.

[awdf, 2016/09/26 15:33:28]

Is it reasonable for me to create a Chromium issue and assign it to myself so I
don't forget to do this? (I like using issue trackers to remind me what I have
outstanding, but I can use some other tool if this refactor is too small /
only-relevant-to-me to merit its own issue)

[Peter Beverloo, 2016/09/26 16:04:34]

Absolutely :) Bugs are free.

+    } else {
+      action_types_vector.push_back(base::ASCIIToUTF16("button"));
+    }
+  }
+  ScopedJavaLocalRef<jobjectArray> action_types =
+      base::android::ToJavaArrayOfStrings(env, action_types_vector);
+
+  std::vector<base::string16> action_placeholders_vector;
+  for (const message_center::ButtonInfo& button : notification.buttons()) {
+    if (!button.placeholder.is_null()) {
+      action_placeholders_vector.push_back(button.placeholder.string());
+    } else {
+      action_placeholders_vector.push_back(base::ASCIIToUTF16(""));
+    }
+  }
+  ScopedJavaLocalRef<jobjectArray> action_placeholders =
+      base::android::ToJavaArrayOfStrings(env, action_placeholders_vector);
+
   ScopedJavaLocalRef<jintArray> vibration_pattern =
       base::android::ToJavaIntArray(env, notification.vibration_pattern());
 
   ScopedJavaLocalRef<jstring> j_profile_id =
       ConvertUTF8ToJavaString(env, profile_id);
 
   Java_NotificationPlatformBridge_displayNotification(
       env, java_object_, j_notification_id, j_origin, j_profile_id, incognito,
       tag, webapk_package, title, body, image, notification_icon, badge,
       vibration_pattern, notification.timestamp().ToJavaTime(),
       notification.renotify(), notification.silent(), action_titles,
-      action_icons);
+      action_icons, action_types, action_placeholders);
 
   regenerated_notification_infos_[notification_id] =
       RegeneratedNotificationInfo(origin_url.spec(), notification.tag(),
                                   ConvertJavaStringToUTF8(env, webapk_package));
 }
 
 void NotificationPlatformBridgeAndroid::Close(
     const std::string& profile_id,
     const std::string& notification_id) {
   const auto iterator = regenerated_notification_infos_.find(notification_id);
@@ skipping 51 matching lines @@
     RegeneratedNotificationInfo() {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     RegeneratedNotificationInfo(const std::string& origin,
                                 const std::string& tag,
                                 const std::string& webapk_package)
     : origin(origin), tag(tag), webapk_package(webapk_package) {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     ~RegeneratedNotificationInfo() {}