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

content/browser/web_contents/web_contents_view_mac.mm

 // 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.
 
 #import <Carbon/Carbon.h>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
 #import "base/mac/scoped_sending_event.h"
 #include "base/message_loop/message_loop.h"
 #import "base/message_loop/message_pump_mac.h"
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #import "content/browser/web_contents/web_drag_dest_mac.h"
 #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"
 #import "ui/base/cocoa/focus_tracker.h"
 #include "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 using blink::WebDragOperation;
 using blink::WebDragOperationsMask;
 using content::DropData;
@@ skipping 258 matching lines @@
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
     DCHECK(RenderViewHostFactory::has_factory());
     return static_cast<RenderWidgetHostViewBase*>(
         render_widget_host->GetView());
   }
 
   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());
   }
   view->SetAllowPauseForResizeOrRepaint(!allow_other_views_);
 
   // Fancy layout comes later; for now just make it our size and resize it
   // with us. In case there are other siblings of the content area, we want
   // to make sure the content area is on the bottom so other things draw over
   // it.
   NSView* view_view = view->GetNativeView();
@@ skipping 262 matching lines @@
 // When the subviews require a layout, their size should be reset to the size
 // of this view. (It is possible for the size to get out of sync as an
 // optimization in preparation for an upcoming WebContentsView resize.
 // http://crbug.com/264207)
 - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
   for (NSView* subview in self.subviews)
     [subview setFrame:self.bounds];
 }
 
 @end