diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/ui/arc/notification/arc_notification_item_impl.cc | |
parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ui/arc/notification/arc_notification_item_impl.cc')
-rw-r--r-- | chromium/ui/arc/notification/arc_notification_item_impl.cc | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/chromium/ui/arc/notification/arc_notification_item_impl.cc b/chromium/ui/arc/notification/arc_notification_item_impl.cc index a889206a543..40b317f87d3 100644 --- a/chromium/ui/arc/notification/arc_notification_item_impl.cc +++ b/chromium/ui/arc/notification/arc_notification_item_impl.cc @@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/memory/ptr_util.h" +#include "ash/shelf/shelf_constants.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/arc/notification/arc_notification_delegate.h" @@ -22,7 +22,6 @@ namespace arc { namespace { -constexpr char kNotifierId[] = "ARC_NOTIFICATION"; constexpr char kNotificationIdPrefix[] = "ARC_NOTIFICATION_"; // Converts from Android notification priority to Chrome notification priority. @@ -68,7 +67,8 @@ ArcNotificationItemImpl::~ArcNotificationItemImpl() { } void ArcNotificationItemImpl::OnUpdatedFromAndroid( - mojom::ArcNotificationDataPtr data) { + mojom::ArcNotificationDataPtr data, + const std::string& app_id) { DCHECK(CalledOnValidThread()); DCHECK_EQ(notification_key_, data->key); @@ -77,21 +77,17 @@ 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()) { - 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_; - if (IsOpeningSettingsSupported()) { + + rich_data.accessible_name = base::UTF8ToUTF16( + data->accessible_name.value_or(data->title + "\n" + data->message)); + if (manager_->IsOpeningSettingsSupported()) { rich_data.settings_button_handler = message_center::SettingsButtonHandler::DELEGATE; } message_center::NotifierId notifier_id( - message_center::NotifierId::ARC_APPLICATION, kNotifierId); + message_center::NotifierId::ARC_APPLICATION, + app_id.empty() ? ash::kDefaultArcNotifierId : app_id); notifier_id.profile_id = profile_id_.GetUserEmail(); auto notification = std::make_unique<message_center::Notification>( @@ -112,6 +108,7 @@ void ArcNotificationItemImpl::OnUpdatedFromAndroid( manually_expanded_or_collapsed_ = true; } + type_ = data->type; expand_state_ = data->expand_state; shown_contents_ = data->shown_contents; swipe_input_rect_ = @@ -128,9 +125,6 @@ void ArcNotificationItemImpl::OnUpdatedFromAndroid( gfx::ImageSkiaRep(*data->snapshot_image, data->snapshot_image_scale)); } - for (auto& observer : observers_) - observer.OnItemUpdated(); - message_center_->AddNotification(std::move(notification)); } @@ -159,10 +153,6 @@ void ArcNotificationItemImpl::OpenSettings() { manager_->OpenNotificationSettings(notification_key_); } -bool ArcNotificationItemImpl::IsOpeningSettingsSupported() const { - return manager_->IsOpeningSettingsSupported(); -} - void ArcNotificationItemImpl::ToggleExpansion() { switch (expand_state_) { case mojom::ArcNotificationExpandState::EXPANDED: @@ -208,6 +198,11 @@ const gfx::ImageSkia& ArcNotificationItemImpl::GetSnapshot() const { return snapshot_; } +mojom::ArcNotificationType ArcNotificationItemImpl::GetNotificationType() + const { + return type_; +} + mojom::ArcNotificationExpandState ArcNotificationItemImpl::GetExpandState() const { return expand_state_; @@ -234,8 +229,4 @@ const std::string& ArcNotificationItemImpl::GetNotificationId() const { return notification_id_; } -const base::string16& ArcNotificationItemImpl::GetAccessibleName() const { - return accessible_name_; -} - } // namespace arc |