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

Side by Side Diff: webrtc/media/devices/deviceinfo.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_BASE_GUNIT_PROD_H_ 11 #ifndef WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_
12 #define WEBRTC_BASE_GUNIT_PROD_H_ 12 #define WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_
13 13
14 #if defined(WEBRTC_ANDROID) 14 #include <string>
15 // Android doesn't use gtest at all, so anything that relies on gtest should
16 // check this define first.
17 #define NO_GTEST
18 #elif defined (GTEST_RELATIVE_PATH)
19 #include "gtest/gtest_prod.h"
20 #else
21 #include "testing/base/gunit_prod.h"
22 #endif
23 15
24 #endif // WEBRTC_BASE_GUNIT_PROD_H_ 16 #include "webrtc/media/devices/devicemanager.h"
17
18 namespace cricket {
19
20 bool GetUsbId(const Device& device, std::string* usb_id);
21 bool GetUsbVersion(const Device& device, std::string* usb_version);
22
23 } // namespace cricket
24
25 #endif // WEBRTC_MEDIA_DEVICES_DEVICEINFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698