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

Side by Side Diff: third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

Issue 1373773003: Implement 'window.isSecureContext'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: document. Created 5 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "config.h" 5 #include "config.h"
6 #include "modules/bluetooth/Bluetooth.h" 6 #include "modules/bluetooth/Bluetooth.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 result.optionalServices.assign(optionalServices); 49 result.optionalServices.assign(optionalServices);
50 } 50 }
51 } 51 }
52 52
53 // https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetooth-requestdevi ce 53 // https://webbluetoothchrome.github.io/web-bluetooth/#dom-bluetooth-requestdevi ce
54 ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState, const RequestDe viceOptions& options, ExceptionState& exceptionState) 54 ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState, const RequestDe viceOptions& options, ExceptionState& exceptionState)
55 { 55 {
56 // 1. If the incumbent settings object is not a secure context, reject promi se with a SecurityError and abort these steps. 56 // 1. If the incumbent settings object is not a secure context, reject promi se with a SecurityError and abort these steps.
57 String errorMessage; 57 String errorMessage;
58 if (!scriptState->executionContext()->isPrivilegedContext(errorMessage)) { 58 if (!scriptState->executionContext()->isSecureContext(errorMessage)) {
59 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(SecurityError, errorMessage)); 59 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(SecurityError, errorMessage));
60 } 60 }
61 61
62 // 2. If the algorithm is not allowed to show a popup, reject promise with a SecurityError and abort these steps. 62 // 2. If the algorithm is not allowed to show a popup, reject promise with a SecurityError and abort these steps.
63 if (!UserGestureIndicator::consumeUserGesture()) { 63 if (!UserGestureIndicator::consumeUserGesture()) {
64 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(SecurityError, "Must be handling a user gesture to show a permission requ est.")); 64 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(SecurityError, "Must be handling a user gesture to show a permission requ est."));
65 } 65 }
66 66
67 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState); 67 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState);
68 if (!webbluetooth) 68 if (!webbluetooth)
69 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); 69 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError));
70 70
71 // 3. In order to convert the arguments from service names and aliases to ju st UUIDs, do the following substeps: 71 // 3. In order to convert the arguments from service names and aliases to ju st UUIDs, do the following substeps:
72 WebRequestDeviceOptions webOptions; 72 WebRequestDeviceOptions webOptions;
73 convertRequestDeviceOptions(options, webOptions, exceptionState); 73 convertRequestDeviceOptions(options, webOptions, exceptionState);
74 if (exceptionState.hadException()) 74 if (exceptionState.hadException())
75 return exceptionState.reject(scriptState); 75 return exceptionState.reject(scriptState);
76 76
77 // Subsequent steps are handled in the browser process. 77 // Subsequent steps are handled in the browser process.
78 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 78 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
79 ScriptPromise promise = resolver->promise(); 79 ScriptPromise promise = resolver->promise();
80 webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<Bluetooth Device, BluetoothError>(resolver)); 80 webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<Bluetooth Device, BluetoothError>(resolver));
81 return promise; 81 return promise;
82 82
83 } 83 }
84 84
85 } // namespace blink 85 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698