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

Unified Diff: device/bluetooth/dbus/fake_bluetooth_media_transport_client.h

Issue 1378573002: Fix static initializers from r316709. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint Created 5 years, 3 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: device/bluetooth/dbus/fake_bluetooth_media_transport_client.h
diff --git a/device/bluetooth/dbus/fake_bluetooth_media_transport_client.h b/device/bluetooth/dbus/fake_bluetooth_media_transport_client.h
index 8403c364c99a1fac577482685b36eda643976510..31b20126928bf052b2c6983722e6e943c30e2494 100644
--- a/device/bluetooth/dbus/fake_bluetooth_media_transport_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_media_transport_client.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_
-#define CHROMEOS_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_
+#ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_
Lei Zhang 2015/09/29 09:25:35 Our code base would be a lot cleaner if everyone r
+#define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_
#include <map>
#include <string>
@@ -41,7 +41,8 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothMediaTransportClient
// and volume, owned by a fake media transport object we emulate.
static const char kTransportDevicePath[];
static const uint8_t kTransportCodec;
- static const std::vector<uint8_t> kTransportConfiguration;
+ static const uint8_t kTransportConfiguration[];
+ static const uint8_t kTransportConfigurationLength;
static const uint16_t kTransportDelay;
static const uint16_t kTransportVolume;
@@ -144,4 +145,4 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothMediaTransportClient
} // namespace bluez
-#endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_
+#endif // DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_MEDIA_TRANSPORT_CLIENT_H_

Powered by Google App Engine
This is Rietveld 408576698