diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 22:23:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 22:23:58 +0000 |
| commit | 7d34040372aacc714b5958b6251fdfe1446e5cce (patch) | |
| tree | 9d30431e9f588b17be26aca0f04a172b59c08073 /media | |
| parent | b888dfe092bc8ea3e485b606ecc23b73955c2d51 (diff) | |
| download | chromium_src-7d34040372aacc714b5958b6251fdfe1446e5cce.zip chromium_src-7d34040372aacc714b5958b6251fdfe1446e5cce.tar.gz chromium_src-7d34040372aacc714b5958b6251fdfe1446e5cce.tar.bz2 | |
Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6126002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70795 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); }; |