diff options
| author | youngki@chromium.org <youngki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 09:26:01 +0000 |
|---|---|---|
| committer | youngki@chromium.org <youngki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 09:26:01 +0000 |
| commit | 063d9430289fdf33106cc23d7225391ec56c9e93 (patch) | |
| tree | cb13ee8851648ec5fa3fdfb7efb6056612dd86ed /device/device.gyp | |
| parent | 6dcc0079d3b89d46b6f3a68570c0eca538aff32d (diff) | |
| download | chromium_src-063d9430289fdf33106cc23d7225391ec56c9e93.zip chromium_src-063d9430289fdf33106cc23d7225391ec56c9e93.tar.gz chromium_src-063d9430289fdf33106cc23d7225391ec56c9e93.tar.bz2 | |
Resubmitting asynchronous bluetooth adapter init CL with fix.
The original CL: https://chromiumcodereview.appspot.com/12018024/ was reverted because it violated the style guide that the struct-level global variable is prohibited and it failed the static analyzer test, in bluetooth_adapter_factory.cc. In order to resolve the issue, I changed adapter_callbacks to a lazy instance.
BUG=135470
Review URL: https://chromiumcodereview.appspot.com/12045051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/device.gyp')
| -rw-r--r-- | device/device.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/device/device.gyp b/device/device.gyp index 803d846b..8537eee 100644 --- a/device/device.gyp +++ b/device/device.gyp @@ -32,7 +32,8 @@ 'bluetooth/bluetooth_device_chromeos.h', 'bluetooth/bluetooth_device_win.cc', 'bluetooth/bluetooth_device_win.h', - 'bluetooth/bluetooth_includes_win.h', + 'bluetooth/bluetooth_init_win.cc', + 'bluetooth/bluetooth_init_win.h', 'bluetooth/bluetooth_out_of_band_pairing_data.h', 'bluetooth/bluetooth_service_record.cc', 'bluetooth/bluetooth_service_record.h', |