diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-09 16:32:20 +0000 |
| commit | b90d7e80c20c7c20831bedfe3fa6028ddab1ae95 (patch) | |
| tree | 308e927055c27a533019d329a9677ce8e7c53e33 /media | |
| parent | d716d4178136a223e9e79b3508c755a71108a068 (diff) | |
| download | chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.zip chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.gz chromium_src-b90d7e80c20c7c20831bedfe3fa6028ddab1ae95.tar.bz2 | |
Reland "Remove base/scoped_handle_win.h."
Fixed the problem with rlz library. Now should be fine to land this again.
This reverts commit 3620d9501af7bff688862c54fdd60f7eb41797f3.
Original Review URL: http://codereview.chromium.org/6126002/
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/win/wavein_input_win.h | 6 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h index 7dd4781..5cc8913 100644 --- a/media/audio/win/wavein_input_win.h +++ b/media/audio/win/wavein_input_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,7 +9,7 @@ #include <mmsystem.h> #include "base/basictypes.h" -#include "base/scoped_handle_win.h" +#include "base/win/scoped_handle.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" @@ -93,7 +93,7 @@ class PCMWaveInAudioInputStream : public AudioInputStream { WAVEHDR* buffer_; // An event that is signaled when the callback thread is ready to stop. - ScopedHandle stopped_event_; + base::win::ScopedHandle stopped_event_; DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream); }; diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index 651c9d2..74717a0 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -1,16 +1,17 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ #define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ +#pragma once #include <windows.h> #include <mmsystem.h> #include <mmreg.h> #include "base/basictypes.h" -#include "base/scoped_handle_win.h" +#include "base/win/scoped_handle.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" @@ -110,7 +111,7 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream { WAVEHDR* buffer_; // An event that is signaled when the callback thread is ready to stop. - ScopedHandle stopped_event_; + base::win::ScopedHandle stopped_event_; DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream); }; |