content/browser/media/capture/desktop_capture_device_aura.cc - Issue 172003004: Fixit: Move tab and desktop capture code to new location.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 172003004: Fixit: Move tab and desktop capture code to new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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 | Annotate | Revision Log

« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura.h ('k') | content/browser/media/capture/desktop_capture_device_aura_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/renderer_host/media/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 "cc/output/copy_output_request.h"	9 #include "cc/output/copy_output_request.h"

10 #include "cc/output/copy_output_result.h"	10 #include "cc/output/copy_output_result.h"

11 #include "content/browser/compositor/image_transport_factory.h"	11 #include "content/browser/compositor/image_transport_factory.h"

12 #include "content/browser/renderer_host/media/content_video_capture_device_core. h"	12 #include "content/browser/media/capture/content_video_capture_device_core.h"

13 #include "content/common/gpu/client/gl_helper.h"	13 #include "content/common/gpu/client/gl_helper.h"

14 #include "content/public/browser/browser_thread.h"	14 #include "content/public/browser/browser_thread.h"

15 #include "media/base/video_util.h"	15 #include "media/base/video_util.h"

16 #include "media/video/capture/video_capture_types.h"	16 #include "media/video/capture/video_capture_types.h"

17 #include "skia/ext/image_operations.h"	17 #include "skia/ext/image_operations.h"

18 #include "third_party/skia/include/core/SkBitmap.h"	18 #include "third_party/skia/include/core/SkBitmap.h"

19 #include "ui/aura/env.h"	19 #include "ui/aura/env.h"

20 #include "ui/aura/window.h"	20 #include "ui/aura/window.h"

21 #include "ui/aura/window_event_dispatcher.h"	21 #include "ui/aura/window_event_dispatcher.h"

22 #include "ui/aura/window_observer.h"	22 #include "ui/aura/window_observer.h"

(...skipping 417 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
440 scoped_ptr<Client> client) {	440 scoped_ptr<Client> client) {

441 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();	441 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();

442 core_->AllocateAndStart(params, client.Pass());	442 core_->AllocateAndStart(params, client.Pass());

443 }	443 }

444	444

445 void DesktopCaptureDeviceAura::StopAndDeAllocate() {	445 void DesktopCaptureDeviceAura::StopAndDeAllocate() {

446 core_->StopAndDeAllocate();	446 core_->StopAndDeAllocate();

447 }	447 }

448	448

449 } // namespace content	449 } // namespace content

OLD	NEW