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

Side by Side Diff: content/browser/media/capture/desktop_capture_device_aura.cc

Issue 1000373002: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/media/capture/desktop_capture_device_aura.h" 5 #include "content/browser/media/capture/desktop_capture_device_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "content/browser/media/capture/aura_window_capture_machine.h" 9 #include "content/browser/media/capture/aura_window_capture_machine.h"
10 #include "content/browser/media/capture/content_video_capture_device_core.h" 10 #include "content/browser/media/capture/content_video_capture_device_core.h"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 namespace { 16 namespace {
17 17
18 void SetCaptureSource(AuraWindowCaptureMachine* machine, 18 void SetCaptureSource(AuraWindowCaptureMachine* machine,
19 const DesktopMediaID& source) { 19 const DesktopMediaID& source) {
20 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 20 DCHECK_CURRENTLY_ON(BrowserThread::UI);
21 21
22 aura::Window* window = DesktopMediaID::GetAuraWindowById(source); 22 aura::Window* window = DesktopMediaID::GetAuraWindowById(source);
23 machine->SetWindow(window); 23 machine->SetWindow(window);
24 } 24 }
25 25
26 } // namespace 26 } // namespace
27 27
28 DesktopCaptureDeviceAura::DesktopCaptureDeviceAura( 28 DesktopCaptureDeviceAura::DesktopCaptureDeviceAura(
29 const DesktopMediaID& source) { 29 const DesktopMediaID& source) {
30 AuraWindowCaptureMachine* machine = new AuraWindowCaptureMachine(); 30 AuraWindowCaptureMachine* machine = new AuraWindowCaptureMachine();
(...skipping 19 matching lines...) Expand all
50 scoped_ptr<Client> client) { 50 scoped_ptr<Client> client) {
51 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); 51 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
52 core_->AllocateAndStart(params, client.Pass()); 52 core_->AllocateAndStart(params, client.Pass());
53 } 53 }
54 54
55 void DesktopCaptureDeviceAura::StopAndDeAllocate() { 55 void DesktopCaptureDeviceAura::StopAndDeAllocate() {
56 core_->StopAndDeAllocate(); 56 core_->StopAndDeAllocate();
57 } 57 }
58 58
59 } // namespace content 59 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/capture/content_video_capture_device_core.cc ('k') | content/browser/media/media_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698