diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 06:42:19 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 06:42:19 +0000 |
| commit | 7ffde472a24e440df7c1fc8dceba86a2bfb1e9a2 (patch) | |
| tree | 7a035d4bd9bf6dc1ebad1f87c246d183751169d3 /device | |
| parent | 1438ddecc934db8ee0b249870a8979287c79753f (diff) | |
| download | chromium_src-7ffde472a24e440df7c1fc8dceba86a2bfb1e9a2.zip chromium_src-7ffde472a24e440df7c1fc8dceba86a2bfb1e9a2.tar.gz chromium_src-7ffde472a24e440df7c1fc8dceba86a2bfb1e9a2.tar.bz2 | |
Update remaining files to use WeakPtr<T>::get() instead of "operator T*"
BUG=245942
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/16136005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/bluetooth_adapter_factory.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc index 5959ca4..0b9d160 100644 --- a/device/bluetooth/bluetooth_adapter_factory.cc +++ b/device/bluetooth/bluetooth_adapter_factory.cc @@ -44,7 +44,7 @@ base::LazyInstance<AdapterCallbackList> adapter_callbacks = void RunAdapterCallbacks() { CHECK(default_adapter.Get().get()); - scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get()); + scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get().get()); for (std::vector<BluetoothAdapterFactory::AdapterCallback>::const_iterator iter = adapter_callbacks.Get().begin(); iter != adapter_callbacks.Get().end(); @@ -90,7 +90,7 @@ void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) { } if (default_adapter.Get()->IsInitialized()) { - callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get())); + callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get().get())); } else { adapter_callbacks.Get().push_back(callback); } @@ -98,7 +98,7 @@ void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) { // static scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::MaybeGetAdapter() { - return scoped_refptr<BluetoothAdapter>(default_adapter.Get()); + return scoped_refptr<BluetoothAdapter>(default_adapter.Get().get()); } } // namespace device |