From d2cf48de1adfc35cfefde04f62a607f848ca3c1d Mon Sep 17 00:00:00 2001
From: "andresp@webrtc.org" <andresp@webrtc.org>
Date: Fri, 12 Sep 2014 13:57:47 +0000
Subject: [PATCH] Fix mac video_render implementation on cocoa.

Hit this while playing around with all compile possibilities for issue 3770.

BUG=3770
TBR=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/23629004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7166 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../video_render/mac/cocoa_full_screen_window.mm      |  4 ++--
 webrtc/modules/video_render/mac/cocoa_render_view.mm  |  5 +++--
 .../video_render/mac/video_render_mac_cocoa_impl.mm   | 11 +++++------
 .../modules/video_render/mac/video_render_nsopengl.mm | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm b/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm
index e86bab1413..31f6b64031 100644
--- a/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm
+++ b/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "cocoa_full_screen_window.h"
-#include "trace.h"
+#include "webrtc/modules/video_render/mac/cocoa_full_screen_window.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 using namespace webrtc;
 
diff --git a/webrtc/modules/video_render/mac/cocoa_render_view.mm b/webrtc/modules/video_render/mac/cocoa_render_view.mm
index 19dcdebc41..86320bee1c 100644
--- a/webrtc/modules/video_render/mac/cocoa_render_view.mm
+++ b/webrtc/modules/video_render/mac/cocoa_render_view.mm
@@ -10,8 +10,9 @@
 
 #import <Cocoa/Cocoa.h>
 #import <AppKit/AppKit.h>
-#import "cocoa_render_view.h"
-#include "trace.h"
+
+#include "webrtc/modules/video_render/mac/cocoa_render_view.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 using namespace webrtc;
 
diff --git a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
index 5c3d6fa781..bdab72bd27 100644
--- a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
+++ b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
@@ -11,12 +11,11 @@
 #include "webrtc/engine_configurations.h"
 #if defined(COCOA_RENDERING)
 
-#import "cocoa_render_view.h"
-
-#include "video_render_mac_cocoa_impl.h"
-#include "critical_section_wrapper.h"
-#include "video_render_nsopengl.h"
-#include "trace.h"
+#include "webrtc/modules/video_render/mac/cocoa_render_view.h"
+#include "webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h"
+#include "webrtc/modules/video_render/mac/video_render_nsopengl.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.mm b/webrtc/modules/video_render/mac/video_render_nsopengl.mm
index 2faca657bb..933ee3b480 100644
--- a/webrtc/modules/video_render/mac/video_render_nsopengl.mm
+++ b/webrtc/modules/video_render/mac/video_render_nsopengl.mm
@@ -11,12 +11,12 @@
 #include "webrtc/engine_configurations.h"
 #if defined(COCOA_RENDERING)
 
-#include "video_render_nsopengl.h"
-#include "critical_section_wrapper.h"
-#include "event_wrapper.h"
-#include "trace.h"
-#include "thread_wrapper.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/video_render/mac/video_render_nsopengl.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {