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

Unified Diff: content/renderer/pepper/pepper_device_enumeration_event_handler.cc

Issue 9959037: Put the Pepper stuff in the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_device_enumeration_event_handler.cc
diff --git a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
index 5ff77efc95674b80206d5afbc8358053db2f4722..d5a1d20c434d88d2fd8e745e27dbbf6fb641f861 100644
--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc
@@ -7,6 +7,8 @@
#include "base/logging.h"
#include "ppapi/shared_impl/ppb_device_ref_shared.h"
+namespace content {
+
namespace {
ppapi::DeviceRefData FromStreamDeviceInfo(
@@ -92,14 +94,14 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
PP_DeviceType_Dev type) {
switch (type) {
case PP_DEVICETYPE_DEV_INVALID:
- return content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+ return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
case PP_DEVICETYPE_DEV_AUDIOCAPTURE:
- return content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
+ return MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE;
case PP_DEVICETYPE_DEV_VIDEOCAPTURE:
- return content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
+ return MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE;
default:
NOTREACHED();
- return content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
+ return MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE;
}
}
@@ -107,11 +109,11 @@ PepperDeviceEnumerationEventHandler::FromPepperDeviceType(
PP_DeviceType_Dev PepperDeviceEnumerationEventHandler::FromMediaStreamType(
media_stream::MediaStreamType type) {
switch (type) {
- case content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:
+ case MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE:
return PP_DEVICETYPE_DEV_INVALID;
- case content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:
+ case MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE:
return PP_DEVICETYPE_DEV_AUDIOCAPTURE;
- case content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
+ case MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE:
return PP_DEVICETYPE_DEV_VIDEOCAPTURE;
default:
NOTREACHED();
@@ -159,3 +161,5 @@ void PepperDeviceEnumerationEventHandler::NotifyDeviceOpened(
callback.Run(request_id, succeeded, label);
}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698