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

Side by Side Diff: media/audio/win/device_enumeration_win.cc

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/win/core_audio_util_win.cc ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <MMDeviceAPI.h> 5 #include <MMDeviceAPI.h>
6 #include <mmsystem.h> 6 #include <mmsystem.h>
7 #include <Functiondiscoverykeys_devpkey.h> // MMDeviceAPI.h must come first 7 #include <Functiondiscoverykeys_devpkey.h> // MMDeviceAPI.h must come first
8 8
9 #include "media/audio/win/audio_manager_win.h" 9 #include "media/audio/win/audio_manager_win.h"
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/win/scoped_co_mem.h" 13 #include "base/win/scoped_co_mem.h"
14 #include "base/win/scoped_comptr.h" 14 #include "base/win/scoped_comptr.h"
15 #include "base/win/scoped_propvariant.h" 15 #include "base/win/scoped_propvariant.h"
16 16
17 using media::AudioDeviceNames; 17 using media::AudioDeviceNames;
18 using base::win::ScopedComPtr; 18 using base::win::ScopedComPtr;
19 using base::win::ScopedCoMem; 19 using base::win::ScopedCoMem;
20 20
21 // Taken from Mmddk.h. 21 // Taken from Mmddk.h.
22 #define DRV_RESERVED 0x0800 22 #define DRV_RESERVED 0x0800
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 result = waveInGetDevCaps(i, &capabilities, sizeof(capabilities)); 169 result = waveInGetDevCaps(i, &capabilities, sizeof(capabilities));
170 if (result == MMSYSERR_NOERROR) 170 if (result == MMSYSERR_NOERROR)
171 return WideToUTF8(capabilities.szPname); 171 return WideToUTF8(capabilities.szPname);
172 } 172 }
173 173
174 return std::string(); 174 return std::string();
175 } 175 }
176 176
177 } // namespace media 177 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/win/core_audio_util_win.cc ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698