Merge 36790 - Insert diagnostics in an attempt to track down a crash in popup...

chrome/browser/renderer_host/render_widget_host_view_mac.h

Index: chrome/browser/renderer_host/render_widget_host_view_mac.h
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_mac.h	(revision 36892)
+++ chrome/browser/renderer_host/render_widget_host_view_mac.h	(working copy)
@@ -115,6 +115,10 @@
 
   void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; }
 
+  // Used only to diagnose the crash in http://crbug.com/31716
+  // TODO(pamg): Remove when no longer needed.
+  void clear_cocoa_view() { cocoa_view_ = nil; }
+
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
Property changes on: chrome\browser\renderer_host\render_widget_host_view_mac.h
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/render_widget_host_hwnd.h:r69-2775