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

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

Issue 10662049: Move the device enumerate/open/close work to device thread from IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small changes to fix the trybots' failure Created 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 host->GetDelegate()->RequestMediaAccessPermission(&request, callback); 130 host->GetDelegate()->RequestMediaAccessPermission(&request, callback);
131 } 131 }
132 132
133 } // namespace 133 } // namespace
134 134
135 MediaStreamDeviceSettings::MediaStreamDeviceSettings( 135 MediaStreamDeviceSettings::MediaStreamDeviceSettings(
136 SettingsRequester* requester) 136 SettingsRequester* requester)
137 : requester_(requester), 137 : requester_(requester),
138 use_fake_ui_(false) { 138 use_fake_ui_(false) {
139 DCHECK(requester_); 139 DCHECK(requester_);
140 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
141 } 140 }
142 141
143 MediaStreamDeviceSettings::~MediaStreamDeviceSettings() { 142 MediaStreamDeviceSettings::~MediaStreamDeviceSettings() {
144 STLDeleteValues(&requests_); 143 STLDeleteValues(&requests_);
145 } 144 }
146 145
147 void MediaStreamDeviceSettings::RequestCaptureDeviceUsage( 146 void MediaStreamDeviceSettings::RequestCaptureDeviceUsage(
148 const std::string& label, int render_process_id, int render_view_id, 147 const std::string& label, int render_process_id, int render_view_id,
149 const StreamOptions& request_options, const GURL& security_origin) { 148 const StreamOptions& request_options, const GURL& security_origin) {
150 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 149 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 content::MediaResponseCallback callback = 365 content::MediaResponseCallback callback =
367 base::Bind(&ResponseCallbackHelper::PostResponse, 366 base::Bind(&ResponseCallbackHelper::PostResponse,
368 helper.get(), label); 367 helper.get(), label);
369 368
370 BrowserThread::PostTask( 369 BrowserThread::PostTask(
371 BrowserThread::UI, FROM_HERE, 370 BrowserThread::UI, FROM_HERE,
372 base::Bind(&DoDeviceRequest, *request, callback)); 371 base::Bind(&DoDeviceRequest, *request, callback));
373 } 372 }
374 373
375 } // namespace media_stream 374 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698