Plumb through notification action types and placeholders on Android

ui/message_center/notification.h

Index: ui/message_center/notification.h
diff --git a/ui/message_center/notification.h b/ui/message_center/notification.h
index 93d255e56daa8439201c0348146a3df69e15ee7c..787d745b660cf1ff1b5543ed2cdd83a14c08eb1b 100644
--- a/ui/message_center/notification.h
+++ b/ui/message_center/notification.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/strings/nullable_string16.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/values.h"
@@ -29,9 +30,13 @@ struct MESSAGE_CENTER_EXPORT NotificationItem {
   NotificationItem(const base::string16& title, const base::string16& message);
 };
 
+enum class ButtonType { BUTTON, TEXT };
+
 struct MESSAGE_CENTER_EXPORT ButtonInfo {

[Peter Beverloo, 2016/09/23 16:01:22]

See my earlier comment about the rule of three, since this does break on the
bots:

https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium...

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

Done.

   base::string16 title;
   gfx::Image icon;
+  ButtonType type = ButtonType::BUTTON;
+  base::NullableString16 placeholder;
 
   ButtonInfo(const base::string16& title);
 };