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

Side by Side Diff: webkit/plugins/ppapi/ppb_video_capture_impl.h

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix content_unittests build failure Created 8 years, 8 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 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "media/video/capture/video_capture.h" 13 #include "media/video/capture/video_capture.h"
14 #include "media/video/capture/video_capture_types.h"
14 #include "ppapi/c/dev/ppp_video_capture_dev.h" 15 #include "ppapi/c/dev/ppp_video_capture_dev.h"
15 #include "ppapi/shared_impl/ppb_video_capture_shared.h" 16 #include "ppapi/shared_impl/ppb_video_capture_shared.h"
16 #include "ppapi/shared_impl/resource.h" 17 #include "ppapi/shared_impl/resource.h"
17 #include "webkit/plugins/ppapi/plugin_delegate.h" 18 #include "webkit/plugins/ppapi/plugin_delegate.h"
18 #include "webkit/plugins/ppapi/ppb_buffer_impl.h" 19 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
19 20
20 struct PP_VideoCaptureDeviceInfo_Dev; 21 struct PP_VideoCaptureDeviceInfo_Dev;
21 22
22 namespace webkit { 23 namespace webkit {
23 namespace ppapi { 24 namespace ppapi {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 bool in_use; 91 bool in_use;
91 void* data; 92 void* data;
92 scoped_refptr<PPB_Buffer_Impl> buffer; 93 scoped_refptr<PPB_Buffer_Impl> buffer;
93 }; 94 };
94 std::vector<BufferInfo> buffers_; 95 std::vector<BufferInfo> buffers_;
95 96
96 const PPP_VideoCapture_Dev* ppp_videocapture_; 97 const PPP_VideoCapture_Dev* ppp_videocapture_;
97 98
98 DeviceRefDataVector devices_data_; 99 DeviceRefDataVector devices_data_;
99 100
100 media::VideoCapture::VideoCaptureCapability capability_; 101 media::VideoCaptureCapability capability_;
101 102
102 DISALLOW_COPY_AND_ASSIGN(PPB_VideoCapture_Impl); 103 DISALLOW_COPY_AND_ASSIGN(PPB_VideoCapture_Impl);
103 }; 104 };
104 105
105 } // namespace ppapi 106 } // namespace ppapi
106 } // namespace webkit 107 } // namespace webkit
107 108
108 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_ 109 #endif // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_CAPTURE_IMPL_H_
OLDNEW
« no previous file with comments | « media/video/capture/video_capture_types.h ('k') | webkit/plugins/ppapi/ppb_video_capture_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698