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

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/webmidi/MIDIAccessInitializer.h" 5 #include "modules/webmidi/MIDIAccessInitializer.h"
6 6
7 #include "bindings/core/v8/ScriptPromise.h" 7 #include "bindings/core/v8/ScriptPromise.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/frame/LocalFrame.h" 12 #include "core/frame/LocalFrame.h"
13 #include "core/frame/Navigator.h" 13 #include "core/frame/Navigator.h"
14 #include "modules/webmidi/MIDIAccess.h" 14 #include "modules/webmidi/MIDIAccess.h"
15 #include "modules/webmidi/MIDIOptions.h" 15 #include "modules/webmidi/MIDIOptions.h"
16 #include "modules/webmidi/MIDIPort.h" 16 #include "modules/webmidi/MIDIPort.h"
17 #include "platform/UserGestureIndicator.h" 17 #include "platform/UserGestureIndicator.h"
18 #include "platform/mojo/MojoHelper.h" 18 #include "platform/mojo/MojoHelper.h"
19 #include "public/platform/ServiceRegistry.h" 19 #include "public/platform/InterfaceProvider.h"
20 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo m-blink.h" 20 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo m-blink.h"
21 21
22 namespace blink { 22 namespace blink {
23 23
24 using PortState = WebMIDIAccessorClient::MIDIPortState; 24 using PortState = WebMIDIAccessorClient::MIDIPortState;
25 25
26 using mojom::blink::PermissionName; 26 using mojom::blink::PermissionName;
27 using mojom::blink::PermissionStatus; 27 using mojom::blink::PermissionStatus;
28 28
29 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MID IOptions& options) 29 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MID IOptions& options)
30 : ScriptPromiseResolver(scriptState) 30 : ScriptPromiseResolver(scriptState)
31 , m_options(options) 31 , m_options(options)
32 { 32 {
33 } 33 }
34 34
35 void MIDIAccessInitializer::contextDestroyed() 35 void MIDIAccessInitializer::contextDestroyed()
36 { 36 {
37 m_permissionService.reset(); 37 m_permissionService.reset();
38 LifecycleObserver::contextDestroyed(); 38 LifecycleObserver::contextDestroyed();
39 } 39 }
40 40
41 ScriptPromise MIDIAccessInitializer::start() 41 ScriptPromise MIDIAccessInitializer::start()
42 { 42 {
43 ScriptPromise promise = this->promise(); 43 ScriptPromise promise = this->promise();
44 m_accessor = MIDIAccessor::create(this); 44 m_accessor = MIDIAccessor::create(this);
45 45
46 Document* document = toDocument(getExecutionContext()); 46 Document* document = toDocument(getExecutionContext());
47 DCHECK(document); 47 DCHECK(document);
48 48
49 document->frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy( &m_permissionService)); 49 document->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_permi ssionService));
50 50
51 bool requestSysEx = m_options.hasSysex() && m_options.sysex(); 51 bool requestSysEx = m_options.hasSysex() && m_options.sysex();
52 Vector<PermissionName> permissions; 52 Vector<PermissionName> permissions;
53 permissions.resize(requestSysEx ? 2 : 1); 53 permissions.resize(requestSysEx ? 2 : 1);
54 54
55 permissions[0] = PermissionName::MIDI; 55 permissions[0] = PermissionName::MIDI;
56 if (requestSysEx) 56 if (requestSysEx)
57 permissions[1] = PermissionName::MIDI_SYSEX; 57 permissions[1] = PermissionName::MIDI_SYSEX;
58 58
59 m_permissionService->RequestPermissions( 59 m_permissionService->RequestPermissions(
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void MIDIAccessInitializer::onPermissionUpdated(PermissionStatus status) 143 void MIDIAccessInitializer::onPermissionUpdated(PermissionStatus status)
144 { 144 {
145 m_permissionService.reset(); 145 m_permissionService.reset();
146 if (status == PermissionStatus::GRANTED) 146 if (status == PermissionStatus::GRANTED)
147 m_accessor->startSession(); 147 m_accessor->startSession();
148 else 148 else
149 reject(DOMException::create(SecurityError)); 149 reject(DOMException::create(SecurityError));
150 } 150 }
151 151
152 } // namespace blink 152 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698