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

Unified Diff: third_party/WebKit/Source/modules/webusb/USB.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webusb/USB.cpp
diff --git a/third_party/WebKit/Source/modules/webusb/USB.cpp b/third_party/WebKit/Source/modules/webusb/USB.cpp
index 06204cf8c21b416a960207d9ef4016047d7cbead..b96657e6b50838ed5250e387c45d0d8eaf849441 100644
--- a/third_party/WebKit/Source/modules/webusb/USB.cpp
+++ b/third_party/WebKit/Source/modules/webusb/USB.cpp
@@ -94,7 +94,7 @@ ScriptPromise USB::getDevices(ScriptState* scriptState)
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
String errorMessage;
- if (!scriptState->executionContext()->isSecureContext(errorMessage))
+ if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, errorMessage));
ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
@@ -110,7 +110,7 @@ ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
String errorMessage;
- if (!scriptState->executionContext()->isSecureContext(errorMessage))
+ if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, errorMessage));
if (!UserGestureIndicator::consumeUserGesture())
@@ -126,7 +126,7 @@ ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
return promise;
}
-ExecutionContext* USB::executionContext() const
+ExecutionContext* USB::getExecutionContext() const
{
return frame() ? frame()->document() : nullptr;
}
« no previous file with comments | « third_party/WebKit/Source/modules/webusb/USB.h ('k') | third_party/WebKit/Source/modules/webusb/USBDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698