bluetooth: Subscribe to notifications

third_party/WebKit/Source/modules/bluetooth/BluetoothSupplement.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/bluetooth/BluetoothSupplement.h"
 
 #include "core/frame/LocalDOMWindow.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 const char* BluetoothSupplement::supplementName()
 {
     return "BluetoothSupplement";
 }
 
 BluetoothSupplement::BluetoothSupplement(WebBluetooth* bluetooth)
     : m_bluetooth(bluetooth)
 {
 }
 
 void BluetoothSupplement::provideTo(LocalFrame& frame, WebBluetooth* bluetooth)
 {
     OwnPtrWillBeRawPtr<BluetoothSupplement> bluetoothSupplement = adoptPtrWillBeNoop(new BluetoothSupplement(bluetooth));
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, supplementName(), bluetoothSupplement.release());
 };
 
-WebBluetooth* BluetoothSupplement::from(ScriptState* scriptState)
+WebBluetooth* BluetoothSupplement::from(LocalDOMWindow* window)
 {
-    LocalDOMWindow* window = scriptState->domWindow();
     if (window && window->frame()) {
         BluetoothSupplement* supplement = static_cast<BluetoothSupplement*>(WillBeHeapSupplement<LocalFrame>::from(window->frame(), supplementName()));
         if (supplement && supplement->m_bluetooth)
             return supplement->m_bluetooth;
     }
     return Platform::current()->bluetooth();
 }
 
+WebBluetooth* BluetoothSupplement::from(ScriptState* scriptState)

[scheib, 2015/10/01 22:05:23]

Ordering, here or in .h should adjust:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Declaration_O...

[ortuno, 2015/10/03 04:03:04]

Done.

+{
+    return BluetoothSupplement::from(scriptState->domWindow());
+}
+
+WebBluetooth* BluetoothSupplement::from(ExecutionContext* executionContext)
+{
+    return BluetoothSupplement::from(executionContext->executingWindow());
+}
+
 DEFINE_TRACE(BluetoothSupplement)
 {
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 }; // blink