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

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

Issue 920963003: Moved scoped_histogram_timer to the main histogram_macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove gyp entries for old unit test in media/ Created 5 years, 10 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 (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/video_capture_manager.h" 5 #include "content/browser/renderer_host/media/video_capture_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/metrics/histogram_macros.h"
14 #include "base/stl_util.h" 15 #include "base/stl_util.h"
15 #include "base/task_runner_util.h" 16 #include "base/task_runner_util.h"
16 #include "base/threading/sequenced_worker_pool.h" 17 #include "base/threading/sequenced_worker_pool.h"
17 #include "content/browser/media/capture/web_contents_video_capture_device.h" 18 #include "content/browser/media/capture/web_contents_video_capture_device.h"
18 #include "content/browser/media/media_internals.h" 19 #include "content/browser/media/media_internals.h"
19 #include "content/browser/renderer_host/media/video_capture_controller.h" 20 #include "content/browser/renderer_host/media/video_capture_controller.h"
20 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h" 21 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
21 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/desktop_media_id.h" 23 #include "content/public/browser/desktop_media_id.h"
23 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
24 #include "content/public/common/media_stream_request.h" 25 #include "content/public/common/media_stream_request.h"
25 #include "media/base/bind_to_current_loop.h" 26 #include "media/base/bind_to_current_loop.h"
26 #include "media/base/scoped_histogram_timer.h"
27 #include "media/video/capture/video_capture_device.h" 27 #include "media/video/capture/video_capture_device.h"
28 #include "media/video/capture/video_capture_device_factory.h" 28 #include "media/video/capture/video_capture_device_factory.h"
29 29
30 #if defined(ENABLE_SCREEN_CAPTURE) 30 #if defined(ENABLE_SCREEN_CAPTURE)
31 #include "content/browser/media/capture/desktop_capture_device.h" 31 #include "content/browser/media/capture/desktop_capture_device.h"
32 #if defined(USE_AURA) 32 #if defined(USE_AURA)
33 #include "content/browser/media/capture/desktop_capture_device_aura.h" 33 #include "content/browser/media/capture/desktop_capture_device_aura.h"
34 #endif 34 #endif
35 #endif 35 #endif
36 36
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 DCHECK(IsOnDeviceThread()); 858 DCHECK(IsOnDeviceThread());
859 #if defined(ENABLE_SCREEN_CAPTURE) 859 #if defined(ENABLE_SCREEN_CAPTURE)
860 DesktopCaptureDevice* desktop_device = 860 DesktopCaptureDevice* desktop_device =
861 static_cast<DesktopCaptureDevice*>(device); 861 static_cast<DesktopCaptureDevice*>(device);
862 desktop_device->SetNotificationWindowId(window_id); 862 desktop_device->SetNotificationWindowId(window_id);
863 VLOG(2) << "Screen capture notification window passed on device thread."; 863 VLOG(2) << "Screen capture notification window passed on device thread.";
864 #endif 864 #endif
865 } 865 }
866 866
867 } // namespace content 867 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_input_device_manager.cc ('k') | media/audio/audio_input_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698