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

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

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 14 matching lines...) Expand all
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" 34 #include "bindings/core/v8/Dictionary.h"
35 #include "bindings/core/v8/DictionaryHelper.h"
35 #include "bindings/core/v8/ScriptWrappable.h" 36 #include "bindings/core/v8/ScriptWrappable.h"
36 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
37 #include "core/events/Event.h" 38 #include "core/events/Event.h"
38 #include "core/frame/UseCounter.h" 39 #include "core/frame/UseCounter.h"
39 #include "core/page/WindowFocusAllowedIndicator.h" 40 #include "core/page/WindowFocusAllowedIndicator.h"
40 #include "modules/notifications/NotificationClient.h" 41 #include "modules/notifications/NotificationClient.h"
41 #include "modules/notifications/NotificationController.h" 42 #include "modules/notifications/NotificationController.h"
42 43
43 namespace WebCore { 44 namespace WebCore {
44 45
45 Notification* Notification::create(ExecutionContext* context, const String& titl e, const Dictionary& options) 46 Notification* Notification::create(ExecutionContext* context, const String& titl e, const Dictionary& options)
46 { 47 {
47 NotificationClient& client = NotificationController::clientFrom(context); 48 NotificationClient& client = NotificationController::clientFrom(context);
48 Notification* notification = adoptRefCountedGarbageCollectedWillBeNoop(new N otification(title, context, &client)); 49 Notification* notification = adoptRefCountedGarbageCollectedWillBeNoop(new N otification(title, context, &client));
49 50
50 String argument; 51 String argument;
51 if (options.get("body", argument)) 52 if (DictionaryHelper::get(options, "body", argument))
52 notification->setBody(argument); 53 notification->setBody(argument);
53 if (options.get("tag", argument)) 54 if (DictionaryHelper::get(options, "tag", argument))
54 notification->setTag(argument); 55 notification->setTag(argument);
55 if (options.get("lang", argument)) 56 if (DictionaryHelper::get(options, "lang", argument))
56 notification->setLang(argument); 57 notification->setLang(argument);
57 if (options.get("dir", argument)) 58 if (DictionaryHelper::get(options, "dir", argument))
58 notification->setDir(argument); 59 notification->setDir(argument);
59 if (options.get("icon", argument)) { 60 if (DictionaryHelper::get(options, "icon", argument)) {
60 KURL iconUrl = argument.isEmpty() ? KURL() : context->completeURL(argume nt); 61 KURL iconUrl = argument.isEmpty() ? KURL() : context->completeURL(argume nt);
61 if (!iconUrl.isEmpty() && iconUrl.isValid()) 62 if (!iconUrl.isEmpty() && iconUrl.isValid())
62 notification->setIconUrl(iconUrl); 63 notification->setIconUrl(iconUrl);
63 } 64 }
64 65
65 notification->suspendIfNeeded(); 66 notification->suspendIfNeeded();
66 return notification; 67 return notification;
67 } 68 }
68 69
69 Notification::Notification(const String& title, ExecutionContext* context, Notif icationClient* client) 70 Notification::Notification(const String& title, ExecutionContext* context, Notif icationClient* client)
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 m_client = 0; 196 m_client = 0;
196 m_state = Closed; 197 m_state = Closed;
197 } 198 }
198 199
199 bool Notification::hasPendingActivity() const 200 bool Notification::hasPendingActivity() const
200 { 201 {
201 return m_state == Showing || (m_asyncRunner && m_asyncRunner->isActive()); 202 return m_state == Showing || (m_asyncRunner && m_asyncRunner->isActive());
202 } 203 }
203 204
204 } // namespace WebCore 205 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698