Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: ui/arc/notification/arc_notification_item_impl.cc

Issue 2892893002: Initial implementation of new-style notification (Closed)
Patch Set: addressed comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/arc/notification/arc_notification_item_impl.h ('k') | ui/message_center/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/arc/notification/arc_notification_item_impl.cc
diff --git a/ui/arc/notification/arc_notification_item_impl.cc b/ui/arc/notification/arc_notification_item_impl.cc
index 610b4e18fdba29807e92e422e48db3cf9b8ffe3b..18ac549fcee3bf88eb78d2cb5a446fce6aa2d362 100644
--- a/ui/arc/notification/arc_notification_item_impl.cc
+++ b/ui/arc/notification/arc_notification_item_impl.cc
@@ -77,8 +77,14 @@ void ArcNotificationItemImpl::OnUpdatedFromAndroid(
rich_data.priority = ConvertAndroidPriority(data->priority);
if (data->small_icon)
rich_data.small_image = gfx::Image::CreateFrom1xBitmap(*data->small_icon);
- if (data->accessible_name.has_value())
- rich_data.accessible_name = base::UTF8ToUTF16(*data->accessible_name);
+ if (data->accessible_name.has_value()) {
+ accessible_name_ = base::UTF8ToUTF16(*data->accessible_name);
+ } else {
+ accessible_name_ = base::JoinString(
+ {base::UTF8ToUTF16(data->title), base::UTF8ToUTF16(data->message)},
+ base::ASCIIToUTF16("\n"));
+ }
+ rich_data.accessible_name = accessible_name_;
message_center::NotifierId notifier_id(
message_center::NotifierId::SYSTEM_COMPONENT, kNotifierId);
@@ -195,4 +201,8 @@ const std::string& ArcNotificationItemImpl::GetNotificationId() const {
return notification_id_;
}
+const base::string16& ArcNotificationItemImpl::GetAccessibleName() const {
+ return accessible_name_;
+}
+
} // namespace arc
« no previous file with comments | « ui/arc/notification/arc_notification_item_impl.h ('k') | ui/message_center/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698