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

Side by Side Diff: content/browser/device_monitor_mac.mm

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move media glue code back to base/mac and add suitable rules in build files to compile the code for… Created 6 years, 3 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
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/device_monitor_mac.h" 5 #include "content/browser/device_monitor_mac.h"
6 6
7 #import <QTKit/QTKit.h> 7 #import <QTKit/QTKit.h>
8 8
9 #include <set> 9 #include <set>
10 10
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/mac/bind_objc_block.h" 13 #include "base/mac/bind_objc_block.h"
14 #include "base/mac/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
15 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #import "media/video/capture/mac/avfoundation_glue.h" 17 #import "media/base/mac/avfoundation_glue.h"
18 18
19 using content::BrowserThread; 19 using content::BrowserThread;
20 20
21 namespace { 21 namespace {
22 22
23 // This class is used to keep track of system devices names and their types. 23 // This class is used to keep track of system devices names and their types.
24 class DeviceInfo { 24 class DeviceInfo {
25 public: 25 public:
26 enum DeviceType { 26 enum DeviceType {
27 kAudio, 27 kAudio,
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 } 532 }
533 533
534 void DeviceMonitorMac::NotifyDeviceChanged( 534 void DeviceMonitorMac::NotifyDeviceChanged(
535 base::SystemMonitor::DeviceType type) { 535 base::SystemMonitor::DeviceType type) {
536 DCHECK(thread_checker_.CalledOnValidThread()); 536 DCHECK(thread_checker_.CalledOnValidThread());
537 // TODO(xians): Remove the global variable for SystemMonitor. 537 // TODO(xians): Remove the global variable for SystemMonitor.
538 base::SystemMonitor::Get()->ProcessDevicesChanged(type); 538 base::SystemMonitor::Get()->ProcessDevicesChanged(type);
539 } 539 }
540 540
541 } // namespace content 541 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | media/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698