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

Unified Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.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/bluetooth/BluetoothDevice.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
index b763a3b6eb47faf0eebd959fe0f926914008d8ee..57585d5790b2e8c6de06b4eb55c6bb7f6d75bf60 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
@@ -34,7 +34,7 @@ BluetoothDevice::BluetoothDevice(ExecutionContext* context, PassOwnPtr<WebBlueto
BluetoothDevice* BluetoothDevice::take(ScriptPromiseResolver* resolver, PassOwnPtr<WebBluetoothDevice> webDevice)
{
ASSERT(webDevice);
- BluetoothDevice* device = new BluetoothDevice(resolver->executionContext(), webDevice);
+ BluetoothDevice* device = new BluetoothDevice(resolver->getExecutionContext(), webDevice);
device->suspendIfNeeded();
return device;
}
@@ -60,7 +60,7 @@ bool BluetoothDevice::disconnectGATTIfConnected()
{
if (m_gatt->connected()) {
m_gatt->setConnected(false);
- BluetoothSupplement::fromExecutionContext(executionContext())->disconnect(id());
+ BluetoothSupplement::fromExecutionContext(getExecutionContext())->disconnect(id());
return true;
}
return false;
@@ -71,9 +71,9 @@ const WTF::AtomicString& BluetoothDevice::interfaceName() const
return EventTargetNames::BluetoothDevice;
}
-ExecutionContext* BluetoothDevice::executionContext() const
+ExecutionContext* BluetoothDevice::getExecutionContext() const
{
- return ActiveDOMObject::executionContext();
+ return ActiveDOMObject::getExecutionContext();
}
DEFINE_TRACE(BluetoothDevice)

Powered by Google App Engine
This is Rietveld 408576698