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

Unified Diff: content/browser/renderer_host/media/media_stream_device_settings.cc

Issue 10166001: Duplicated typedef declaration of DeviceMap (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_device_settings.cc
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index d299b7f5489853afee0cba95a605c82db32e5985..328a1eb5e8fc9747b286a159f35cf21d9b91f024 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -76,7 +76,7 @@ class DeviceIdEquals {
namespace media_stream {
-typedef std::map< MediaStreamType, StreamDeviceInfoArray > DeviceMap;
+typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap;
// Device request contains all data needed to keep track of requests between the
// different calls.
@@ -102,8 +102,6 @@ class MediaStreamDeviceSettingsRequest : public MediaStreamRequest {
bool posted_task;
};
-typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap;
-
MediaStreamDeviceSettings::MediaStreamDeviceSettings(
SettingsRequester* requester)
: requester_(requester),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698