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

Side by Side Diff: third_party/WebKit/Source/web/MIDIClientProxy.cpp

Issue 1602703005: Web MIDI: Ask permissions of the content layer always (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split changes outside blink Created 4 years, 11 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 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 "web/MIDIClientProxy.h" 31 #include "web/MIDIClientProxy.h"
32 32
33 #include "modules/webmidi/MIDIAccessInitializer.h" 33 #include "modules/webmidi/MIDIAccessInitializer.h"
34 #include "public/web/WebMIDIClient.h" 34 #include "public/web/WebMIDIClient.h"
35 #include "public/web/WebMIDIOptions.h"
35 #include "public/web/WebMIDIPermissionRequest.h" 36 #include "public/web/WebMIDIPermissionRequest.h"
36 37
37 namespace blink { 38 namespace blink {
38 39
39 MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client) 40 MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client)
40 : m_client(client) 41 : m_client(client)
41 { 42 {
42 } 43 }
43 44
44 void MIDIClientProxy::requestSysexPermission(MIDIAccessInitializer* initializer) 45 void MIDIClientProxy::requestPermission(MIDIAccessInitializer* initializer, cons t MIDIOptions& options)
45 { 46 {
46 if (m_client) 47 if (m_client)
47 m_client->requestSysexPermission(WebMIDIPermissionRequest(initializer)); 48 m_client->requestPermission(WebMIDIPermissionRequest(initializer), WebMI DIOptions(options.hasSysex()));
48 else 49 else
49 initializer->resolveSysexPermission(false); 50 initializer->resolvePermission(false);
50 } 51 }
51 52
52 void MIDIClientProxy::cancelSysexPermissionRequest(MIDIAccessInitializer* initia lizer) 53 void MIDIClientProxy::cancelPermissionRequest(MIDIAccessInitializer* initializer )
53 { 54 {
54 if (m_client) 55 if (m_client)
55 m_client->cancelSysexPermissionRequest(WebMIDIPermissionRequest(initiali zer)); 56 m_client->cancelPermissionRequest(WebMIDIPermissionRequest(initializer)) ;
56 } 57 }
57 58
58 } // namespace blink 59 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698