diff options
| -rw-r--r-- | media/audio/test_audio_input_controller_factory.h | 1 | ||||
| -rw-r--r-- | media/audio/win/waveout_output_win.h | 1 | ||||
| -rw-r--r-- | media/base/media_export.h | 3 | ||||
| -rw-r--r-- | media/base/media_log.h | 1 | ||||
| -rw-r--r-- | media/base/media_log_event.h | 1 | ||||
| -rw-r--r-- | media/video/capture/win/filter_base_win.h | 3 | ||||
| -rw-r--r-- | media/video/capture/win/pin_base_win.h | 3 | ||||
| -rw-r--r-- | media/video/capture/win/sink_input_pin_win.h | 1 | ||||
| -rw-r--r-- | media/video/capture/win/video_capture_device_win.h | 1 |
9 files changed, 3 insertions, 12 deletions
diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h index b4a2cb1..5e2633d 100644 --- a/media/audio/test_audio_input_controller_factory.h +++ b/media/audio/test_audio_input_controller_factory.h @@ -4,7 +4,6 @@ #ifndef MEDIA_AUDIO_TEST_AUDIO_INPUT_CONTROLLER_FACTORY_H_ #define MEDIA_AUDIO_TEST_AUDIO_INPUT_CONTROLLER_FACTORY_H_ -#pragma once #include "base/bind.h" #include "media/audio/audio_input_controller.h" diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h index 9c73048..cbf7219 100644 --- a/media/audio/win/waveout_output_win.h +++ b/media/audio/win/waveout_output_win.h @@ -4,7 +4,6 @@ #ifndef MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ #define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_ -#pragma once #include <windows.h> #include <mmsystem.h> diff --git a/media/base/media_export.h b/media/base/media_export.h index b3e47d5..48f6f45 100644 --- a/media/base/media_export.h +++ b/media/base/media_export.h @@ -1,10 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef MEDIA_BASE_MEDIA_EXPORT_H_ #define MEDIA_BASE_MEDIA_EXPORT_H_ -#pragma once // Define MEDIA_EXPORT so that functionality implemented by the Media module // can be exported to consumers. diff --git a/media/base/media_log.h b/media/base/media_log.h index fab1a63..0e93c6b 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -4,7 +4,6 @@ #ifndef MEDIA_BASE_MEDIA_LOG_H_ #define MEDIA_BASE_MEDIA_LOG_H_ -#pragma once #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/media/base/media_log_event.h b/media/base/media_log_event.h index b301570..d8246c14 100644 --- a/media/base/media_log_event.h +++ b/media/base/media_log_event.h @@ -4,7 +4,6 @@ #ifndef MEDIA_BASE_MEDIA_LOG_EVENT_H_ #define MEDIA_BASE_MEDIA_LOG_EVENT_H_ -#pragma once #include "base/time.h" #include "base/values.h" diff --git a/media/video/capture/win/filter_base_win.h b/media/video/capture/win/filter_base_win.h index 3f5d465..9d5aa76 100644 --- a/media/video/capture/win/filter_base_win.h +++ b/media/video/capture/win/filter_base_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,6 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_FILTER_BASE_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_FILTER_BASE_WIN_H_ -#pragma once // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE diff --git a/media/video/capture/win/pin_base_win.h b/media/video/capture/win/pin_base_win.h index ac84f2e..33f403f 100644 --- a/media/video/capture/win/pin_base_win.h +++ b/media/video/capture/win/pin_base_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,6 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_PIN_BASE_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_PIN_BASE_WIN_H_ -#pragma once // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE diff --git a/media/video/capture/win/sink_input_pin_win.h b/media/video/capture/win/sink_input_pin_win.h index 83679d2..16168a3 100644 --- a/media/video/capture/win/sink_input_pin_win.h +++ b/media/video/capture/win/sink_input_pin_win.h @@ -7,7 +7,6 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_ -#pragma once #include "media/video/capture/video_capture_device.h" #include "media/video/capture/video_capture_types.h" diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h index 7e9f65b..8a4f305 100644 --- a/media/video/capture/win/video_capture_device_win.h +++ b/media/video/capture/win/video_capture_device_win.h @@ -8,7 +8,6 @@ #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ -#pragma once // Avoid including strsafe.h via dshow as it will cause build warnings. #define NO_DSHOW_STRSAFE |