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

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

Issue 11106013: Fix a M23 stable crash issue for device enumeration on Mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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 | content/browser/device_monitor_mac.cc » ('j') | no next file with comments »
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 #ifndef CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_ 5 #ifndef CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_
6 #define CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_ 6 #define CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_
7 7
8 #include <CoreAudio/AudioHardware.h>
8 #include <IOKit/IOKitLib.h> 9 #include <IOKit/IOKitLib.h>
9 10
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/basictypes.h" 13 #include "base/basictypes.h"
13 #include "base/system_monitor/system_monitor.h" 14 #include "base/system_monitor/system_monitor.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 class DeviceMonitorMac { 18 class DeviceMonitorMac {
18 public: 19 public:
19 DeviceMonitorMac(); 20 DeviceMonitorMac();
20 ~DeviceMonitorMac(); 21 ~DeviceMonitorMac();
21 22
22 private: 23 private:
23 void RegisterAudioServices(); 24 void RegisterAudioServices();
24 void RegisterVideoServices(); 25 void RegisterVideoServices();
25 26
26 static void AudioDeviceCallback(void *context, io_iterator_t iterator); 27 static OSStatus AudioDeviceCallback(
27 static void VideoDeviceCallback(void *context, io_iterator_t iterator); 28 AudioObjectID object, UInt32 size,
29 const AudioObjectPropertyAddress addresses[],
30 void* context);
31
32 static void VideoDeviceCallback(void* context, io_iterator_t iterator);
28 33
29 // Forward the notifications to system monitor. 34 // Forward the notifications to system monitor.
30 void NotifyDeviceChanged(base::SystemMonitor::DeviceType type); 35 void NotifyDeviceChanged(base::SystemMonitor::DeviceType type);
31 36
32 // Helper. 37 // Helper.
33 void RegisterServices(CFMutableDictionaryRef dictionary, 38 void RegisterServices(CFMutableDictionaryRef dictionary,
34 IOServiceMatchingCallback callback); 39 IOServiceMatchingCallback callback);
35 40
36 IONotificationPortRef notification_port_; 41 IONotificationPortRef notification_port_;
37 std::vector<io_iterator_t*> notification_iterators_; 42 std::vector<io_iterator_t*> notification_iterators_;
38 43
39 DISALLOW_COPY_AND_ASSIGN(DeviceMonitorMac); 44 DISALLOW_COPY_AND_ASSIGN(DeviceMonitorMac);
40 }; 45 };
41 46
42 } // namespace content 47 } // namespace content
43 48
44 #endif // CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_ 49 #endif // CONTENT_BROWSER_DEVICE_MONITOR_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/device_monitor_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698