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

Side by Side Diff: content/public/common/media_stream_request.h

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/public/common/frame_navigate_params.h ('k') | content/public/common/password_form.h » ('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_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "googleurl/src/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 // Types of media streams. 20 // Types of media streams.
21 enum MediaStreamType { 21 enum MediaStreamType {
22 MEDIA_NO_SERVICE = 0, 22 MEDIA_NO_SERVICE = 0,
23 23
24 // A device provided by the operating system (e.g., webcam input). 24 // A device provided by the operating system (e.g., webcam input).
25 MEDIA_DEVICE_AUDIO_CAPTURE, 25 MEDIA_DEVICE_AUDIO_CAPTURE,
26 MEDIA_DEVICE_VIDEO_CAPTURE, 26 MEDIA_DEVICE_VIDEO_CAPTURE,
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 }; 146 };
147 147
148 // Callback used return results of media access requests. 148 // Callback used return results of media access requests.
149 typedef base::Callback<void( 149 typedef base::Callback<void(
150 const MediaStreamDevices& devices, 150 const MediaStreamDevices& devices,
151 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback; 151 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
152 152
153 } // namespace content 153 } // namespace content
154 154
155 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 155 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW
« no previous file with comments | « content/public/common/frame_navigate_params.h ('k') | content/public/common/password_form.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698