MacViews: Guard Objective-C bits in content::WebContentsViewDelegate with __OBJC__

content/browser/web_contents/web_contents_view_mac.mm

Index: content/browser/web_contents/web_contents_view_mac.mm
diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm
index c27c9927397f02c273ef4721495a1a56ad8db365..ea06f430807ecd92f46aba1169c2c2b34c72291f 100644
--- a/content/browser/web_contents/web_contents_view_mac.mm
+++ b/content/browser/web_contents/web_contents_view_mac.mm
@@ -20,7 +20,7 @@
 #import "content/browser/web_contents/web_drag_source_mac.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "content/public/browser/web_contents_view_delegate.h"
+#import "content/public/browser/web_contents_view_delegate_mac.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/custom_data_helper.h"
@@ -299,9 +299,13 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(
       render_widget_host);
   if (delegate()) {
+    WebContentsViewDelegateMac* delegate_mac =
+        delegate()->AsWebContentsViewDelegateMac();
     base::scoped_nsobject<NSObject<RenderWidgetHostViewMacDelegate> >
-        rw_delegate(
-            delegate()->CreateRenderWidgetHostViewDelegate(render_widget_host));
+        rw_delegate(delegate_mac
+                        ? delegate_mac->CreateRenderWidgetHostViewDelegate(
+                              render_widget_host)
+                        : nil);

[tapted, 2014/08/27 14:09:10]

This is a bit simpler in patchset 3 - it can go back to that if
ShellWebContentsViewDelegate is given a different a different parent class on
Mac (either with #ifdefs or a separate interface/header). But I'm not sure
there's much gained.

 
     view->SetDelegate(rw_delegate.get());
   }