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

Side by Side Diff: content/browser/renderer_host/media/media_stream_device_settings.cc

Issue 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed unneeded include + rebase Created 9 years, 5 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/renderer_host/media/media_stream_device_settings.h" 5 #include "content/browser/renderer_host/media/media_stream_device_settings.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util.h"
8 #include "base/task.h" 8 #include "base/task.h"
9 #include "content/browser/browser_thread.h" 9 #include "content/browser/browser_thread.h"
10 #include "content/browser/renderer_host/media/media_stream_settings_requester.h" 10 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
11 #include "content/common/media/media_stream_options.h" 11 #include "content/common/media/media_stream_options.h"
12 12
13 namespace media_stream { 13 namespace media_stream {
14 14
15 typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap; 15 typedef std::map<MediaStreamType, StreamDeviceInfoArray> DeviceMap;
16 16
17 // Device request contains all data needed to keep track of requests between the 17 // Device request contains all data needed to keep track of requests between the
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 } 130 }
131 } 131 }
132 132
133 void MediaStreamDeviceSettings::UseFakeUI() { 133 void MediaStreamDeviceSettings::UseFakeUI() {
134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 134 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
135 use_fake_ui_ = true; 135 use_fake_ui_ = true;
136 } 136 }
137 137
138 } // namespace media_stream 138 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698