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

Unified Diff: content/child/notifications/pending_notification.cc

Issue 1644083002: Fetch notification action icons and pass them through in resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ActionIconBlink
Patch Set: Rebase. Created 4 years, 10 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
Index: content/child/notifications/pending_notification.cc
diff --git a/content/child/notifications/pending_notification.cc b/content/child/notifications/pending_notification.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0db2834db987654503e30eb3eb2dd5517d364f10
--- /dev/null
+++ b/content/child/notifications/pending_notification.cc
@@ -0,0 +1,90 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/child/notifications/pending_notification.h"
+
+#include "base/barrier_closure.h"
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/location.h"
+#include "base/thread_task_runner_handle.h"
+#include "content/public/common/notification_resources.h"
+#include "url/gurl.h"
+
+namespace content {
+
+PendingNotification::PendingNotification(
+ const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner)
+ : main_task_runner_(main_task_runner), weak_factory_(this) {}
+
+PendingNotification::~PendingNotification() {}
+
+void PendingNotification::FetchResources(
+ const blink::WebNotificationData& notification_data,
+ const base::Closure& fetches_finished_callback) {
+ // TODO(mvanouwerkerk): Add a timeout mechanism: crbug.com/579137
+
+ size_t num_actions = notification_data.actions.size();
+ action_icons_.resize(num_actions);
+
+ size_t num_closures = 1 /* notification icon */ + num_actions;
+ fetches_finished_barrier_closure_ =
+ base::BarrierClosure(num_closures, fetches_finished_callback);
+
+ FetchImageResource(notification_data.icon,
+ base::Bind(&PendingNotification::DidFetchNotificationIcon,
+ weak_factory_.GetWeakPtr()));
+ for (size_t i = 0; i < num_actions; i++) {
+ FetchImageResource(notification_data.actions[i].icon,
+ base::Bind(&PendingNotification::DidFetchActionIcon,
+ weak_factory_.GetWeakPtr(), i));
+ }
+}
+
+NotificationResources PendingNotification::GetResources() const {
+ NotificationResources resources;
+ resources.notification_icon = notification_icon_;
+ resources.action_icons = action_icons_;
+ return resources;
+}
+
+void PendingNotification::FetchImageResource(
+ const blink::WebURL& image_web_url,
+ const ImageLoadCompletedCallback& image_callback) {
+ if (image_web_url.isEmpty()) {
+ image_callback.Run(SkBitmap());
+ return;
+ }
+
+ // Explicitly convert the WebURL to a GURL before passing it to a different
+ // thread. This is important because WebURLs must not be passed between
+ // threads, and per base::Bind() semantics conversion would otherwise be done
+ // on the receiving thread.
+ GURL image_gurl(image_web_url);
+
+ scoped_refptr<NotificationImageLoader> image_loader(
+ new NotificationImageLoader(image_callback,
+ base::ThreadTaskRunnerHandle::Get(),
+ main_task_runner_));
+ image_loaders_.push_back(image_loader);
+ main_task_runner_->PostTask(
+ FROM_HERE, base::Bind(&NotificationImageLoader::StartOnMainThread,
+ image_loader, image_gurl));
+}
+
+void PendingNotification::DidFetchNotificationIcon(
+ const SkBitmap& notification_icon) {
+ notification_icon_ = notification_icon;
+ fetches_finished_barrier_closure_.Run();
+}
+
+void PendingNotification::DidFetchActionIcon(size_t action_index,
+ const SkBitmap& action_icon) {
+ DCHECK_LT(action_index, action_icons_.size());
+
+ action_icons_[action_index] = action_icon;
+ fetches_finished_barrier_closure_.Run();
+}
+
+} // namespace content
« no previous file with comments | « content/child/notifications/pending_notification.h ('k') | content/child/notifications/pending_notifications_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698