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

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

Issue 2496423004: arc: enable use_new_wrapper_types for notifications.mojom (Closed)
Patch Set: fix ui_arc_unittests Created 4 years, 1 month 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
Index: ui/arc/notification/arc_notification_manager.cc
diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc
index d940c5865a7dcbb29c8d45c0ea09657d3ff38ea8..555543dffe135d50e3ec5f4591cff141a14155ce 100644
--- a/ui/arc/notification/arc_notification_manager.cc
+++ b/ui/arc/notification/arc_notification_manager.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm_shell.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/arc/arc_bridge_service.h"
#include "mojo/common/common_type_converters.h"
#include "ui/arc/notification/arc_custom_notification_item.h"
@@ -92,8 +93,8 @@ void ArcNotificationManager::OnNotificationPosted(
it->second->UpdateWithArcNotificationData(std::move(data));
}
-void ArcNotificationManager::OnNotificationRemoved(const mojo::String& key) {
- auto it = items_.find(key.get());
+void ArcNotificationManager::OnNotificationRemoved(const std::string& key) {
+ auto it = items_.find(key);
if (it == items_.end()) {
VLOG(3) << "Android requests to remove a notification (key: " << key
<< "), but it is already gone.";
@@ -236,9 +237,12 @@ void ArcNotificationManager::CloseNotificationWindow(const std::string& key) {
}
void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
+ const base::string16 text16(
+ base::UTF8ToUTF16(data->text.has_value() ? *data->text : ""));
Luis Héctor Chávez 2016/11/15 19:22:59 nit: s/""/std::string()/
Yusuke Sato 2016/11/15 19:27:35 Done.
+ const base::string16 dismiss_text16(base::UTF8ToUTF16(
+ data->dismiss_text.has_value() ? *data->dismiss_text : ""));
ash::WmShell::Get()->toast_manager()->Show(
- ash::ToastData(data->id, data->text.To<base::string16>(), data->duration,
- data->dismiss_text.To<base::string16>()));
+ ash::ToastData(data->id, text16, data->duration, dismiss_text16));
}
void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {

Powered by Google App Engine
This is Rietveld 408576698