| Index: chrome/browser/notifications/platform_notification_service_impl.cc
|
| diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
|
| index 7b1472ac7d62e6cf12000c86bb5b7f3d667b9a75..b6f2add616f041f964da8934923e1a83080bce49 100644
|
| --- a/chrome/browser/notifications/platform_notification_service_impl.cc
|
| +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
|
| @@ -39,6 +39,7 @@
|
| #include "content/public/common/notification_resources.h"
|
| #include "content/public/common/platform_notification_data.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/message_center/notification.h"
|
| #include "ui/message_center/notification_types.h"
|
| #include "ui/message_center/notifier_settings.h"
|
| #include "url/url_constants.h"
|
| @@ -448,6 +449,15 @@ Notification PlatformNotificationServiceImpl::CreateNotificationFromData(
|
| // the 1x bitmap - crbug.com/585815.
|
| button.icon =
|
| gfx::Image::CreateFrom1xBitmap(notification_resources.action_icons[i]);
|
| + button.placeholder = notification_data.actions[i].placeholder;
|
| + switch (notification_data.actions[i].type) {
|
| + case content::PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON:
|
| + button.type = message_center::ButtonType::BUTTON;
|
| + break;
|
| + case content::PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT:
|
| + button.type = message_center::ButtonType::TEXT;
|
| + break;
|
| + }
|
| buttons.push_back(button);
|
| }
|
| notification.set_buttons(buttons);
|
|
|