diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 17:38:35 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 17:38:35 +0000 |
| commit | b4a971600cb13a7691fe5654e283ccab0f8dda33 (patch) | |
| tree | 36167597b1d9ab3993f7d98ac31ae2bcf56285ef /device/bluetooth/bluetooth_init_win.h | |
| parent | 50e9dcf831492784c434b95c56808402c6de6295 (diff) | |
| download | chromium_src-b4a971600cb13a7691fe5654e283ccab0f8dda33.zip chromium_src-b4a971600cb13a7691fe5654e283ccab0f8dda33.tar.gz chromium_src-b4a971600cb13a7691fe5654e283ccab0f8dda33.tar.bz2 | |
Revert 178311 - it broke the Linux sizes bot because of the new static initializer added to bluetooth_adapter_factory.cc.
> We cannot run adapter callbacks inside BluetoothAdapterWin because passing scoped_refptr<BluetoothAdapter>(this) will destroy the adapter itself after the callback is finished.
>
> Instead, bluetooth_adapter_factory.cc maintains a vector of callbacks and they will be run once the adapter is initialized.
>
> I also put Bluetooth API initialization code into bluetooth_init_win.h and bluetooth_init_win.cc. From now on any code that wants to use Windows Bluetooth APIs should just include bluetooth_init_win.h.
>
> BUG=135470
>
> Review URL: https://chromiumcodereview.appspot.com/12018024
TBR=youngki@chromium.org
Review URL: https://codereview.chromium.org/12035055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_init_win.h')
| -rw-r--r-- | device/bluetooth/bluetooth_init_win.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/device/bluetooth/bluetooth_init_win.h b/device/bluetooth/bluetooth_init_win.h deleted file mode 100644 index 0bc89ea..0000000 --- a/device/bluetooth/bluetooth_init_win.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2013 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. - -#ifndef DEVICE_BLUETOOTH_BLUETOOTH_INIT_WIN_H_ -#define DEVICE_BLUETOOTH_BLUETOOTH_INIT_WIN_H_ - -// windows.h needs to be included before BluetoothAPIs.h. -#include <windows.h> - -#include <BluetoothAPIs.h> -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h. -#undef FACILITY_VISUALCPP -#endif -#include <delayimp.h> - -#pragma comment(lib, "Bthprops.lib") - -namespace device { -namespace bluetooth_init_win { - -// Returns true if the machine has a bluetooth stack available. The first call -// to this function will involve file IO, so it should be done on an appropriate -// thread. This function is not threadsafe. -bool HasBluetoothStack(); - -} // namespace bluetooth_init_win -} // namespace device - -#endif // DEVICE_BLUETOOTH_BLUETOOTH_INIT_WIN_H_
\ No newline at end of file |