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

Side by Side Diff: Source/modules/notifications/Notification.cpp

Issue 556193002: Add NotificationOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@dic-webmidi
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/notifications/Notification.h" 32 #include "modules/notifications/Notification.h"
33 33
34 #include "bindings/core/v8/Dictionary.h"
35 #include "bindings/core/v8/ScriptWrappable.h" 34 #include "bindings/core/v8/ScriptWrappable.h"
36 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
37 #include "core/events/Event.h" 36 #include "core/events/Event.h"
38 #include "core/frame/UseCounter.h" 37 #include "core/frame/UseCounter.h"
39 #include "core/page/WindowFocusAllowedIndicator.h" 38 #include "core/page/WindowFocusAllowedIndicator.h"
40 #include "modules/notifications/NotificationClient.h" 39 #include "modules/notifications/NotificationClient.h"
41 #include "modules/notifications/NotificationController.h" 40 #include "modules/notifications/NotificationController.h"
41 #include "modules/notifications/NotificationOptions.h"
42 #include "modules/notifications/NotificationPermissionClient.h" 42 #include "modules/notifications/NotificationPermissionClient.h"
43 43
44 namespace blink { 44 namespace blink {
45 45
46 Notification* Notification::create(ExecutionContext* context, const String& titl e, const Dictionary& options) 46 Notification* Notification::create(ExecutionContext* context, const String& titl e, const NotificationOptions* options)
47 { 47 {
48 NotificationClient& client = NotificationController::clientFrom(context); 48 NotificationClient& client = NotificationController::clientFrom(context);
49 Notification* notification = adoptRefCountedGarbageCollectedWillBeNoop(new N otification(title, context, &client)); 49 Notification* notification = adoptRefCountedGarbageCollectedWillBeNoop(new N otification(title, context, &client));
50 50
51 String argument; 51 if (options->hasBody())
Peter Beverloo 2014/09/10 14:30:34 The specification defines "tag" and "body" as defa
bashi 2014/09/10 15:02:01 Done. I was looking at http://www.w3.org/TR/notifi
52 if (DictionaryHelper::get(options, "body", argument)) 52 notification->setBody(options->body());
53 notification->setBody(argument); 53 if (options->hasTag())
54 if (DictionaryHelper::get(options, "tag", argument)) 54 notification->setTag(options->tag());
55 notification->setTag(argument); 55 notification->setLang(options->lang());
56 if (DictionaryHelper::get(options, "lang", argument)) 56 notification->setDir(options->dir());
57 notification->setLang(argument); 57 if (options->hasIcon()) {
58 if (DictionaryHelper::get(options, "dir", argument)) 58 KURL iconUrl = options->icon().isEmpty() ? KURL() : context->completeURL (options->icon());
59 notification->setDir(argument);
60 if (DictionaryHelper::get(options, "icon", argument)) {
61 KURL iconUrl = argument.isEmpty() ? KURL() : context->completeURL(argume nt);
62 if (!iconUrl.isEmpty() && iconUrl.isValid()) 59 if (!iconUrl.isEmpty() && iconUrl.isValid())
63 notification->setIconUrl(iconUrl); 60 notification->setIconUrl(iconUrl);
64 } 61 }
65 62
66 notification->suspendIfNeeded(); 63 notification->suspendIfNeeded();
67 return notification; 64 return notification;
68 } 65 }
69 66
70 Notification::Notification(const String& title, ExecutionContext* context, Notif icationClient* client) 67 Notification::Notification(const String& title, ExecutionContext* context, Notif icationClient* client)
71 : ActiveDOMObject(context) 68 : ActiveDOMObject(context)
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 197
201 m_asyncRunner.stop(); 198 m_asyncRunner.stop();
202 } 199 }
203 200
204 bool Notification::hasPendingActivity() const 201 bool Notification::hasPendingActivity() const
205 { 202 {
206 return m_state == NotificationStateShowing || m_asyncRunner.isActive(); 203 return m_state == NotificationStateShowing || m_asyncRunner.isActive();
207 } 204 }
208 205
209 } // namespace blink 206 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698