diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:47:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:47:45 +0000 |
| commit | 2c4fcc993ec368bdfee6e30b25c7fff84ecc9202 (patch) | |
| tree | 2f4743f5e9bd3f94ee53735aaafe25c168d2e42d /media/audio/audio_manager_base.h | |
| parent | 8bdded0fb5bdde0eec9b235b9876760f166e45b1 (diff) | |
| download | chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.zip chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.gz chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.bz2 | |
Replace string16 with base::string16 in gpu, media, and remoting.
R=piman@chromium.org, scherkus@chromium.org, sergeyu@chromium.org
TBR=piman, scherkus, wez
Review URL: https://codereview.chromium.org/114613002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_manager_base.h')
| -rw-r--r-- | media/audio/audio_manager_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 45b757f..09b021a 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -51,7 +51,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE; virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE; - virtual string16 GetAudioInputDeviceModel() OVERRIDE; + virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; virtual void ShowAudioInputSettings() OVERRIDE; |